tiboFDG/Ipseity-Demo
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

Browse Source 
# Conflicts:
#	Assets/TextMesh Pro/Fonts/TMP_Assets/CourierPrime-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/CutiveMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/Inconsolata-VariableFont_wdth,wght SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/ShareTechMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/SpecialElite-Regular SDF.asset
#	Assets/_Content/Prefabs/OctoPlayerFP.prefab
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
This commit is contained in:
Ferlat Thibaud
2026-06-03 13:52:36 +02:00
parent bf9a4e64ca fc362d0e23
commit 3c8e9080f3
64 changed files with 6855 additions and 4698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Content/Scenes/Omnissiah.unity
+6 -6
View File
@@ -186,7 +186,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1288571885}
- {fileID: 735183341}
- {fileID: 1820726847}
m_Father: {fileID: 0}
@@ -220,6 +219,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1288571885}
- {fileID: 57213872}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -703,7 +703,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1288571885
Transform:
m_ObjectHideFlags: 0
@@ -718,7 +718,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1857350192}
m_Father: {fileID: 581223803}
m_Father: {fileID: 622343290}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1549040694
PrefabInstance:
@@ -797,8 +797,8 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4152409555847978467, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
- {fileID: 4484393045093388587, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
- {fileID: 0}
- {fileID: 0}
m_RemovedGameObjects:
- {fileID: 4625798697874999476, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
m_AddedGameObjects: []
@@ -1022,7 +1022,7 @@ MonoBehaviour:
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
m_CallState: 0
_onTriggerDelayed:
m_PersistentCalls:
m_Calls: