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/HouseOfLeaves.unity
+6 -6
View File
@@ -201,7 +201,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 300277218}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -261,7 +261,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 40, y: 40, z: 40}
m_LocalScale: {x: 0.5251041, y: 40, z: 13.3708}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1920554116}
@@ -324,9 +324,9 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 412733324}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6.9868, y: -0, z: 19.0302}
m_LocalScale: {x: 0.8365, y: 1, z: 1.526204}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 917697129}
@@ -951,7 +951,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -7907523562308333758, guid: bc77fc4360cf7554d882153c57d02f91, type: 3}
propertyPath: m_LocalPosition.z
value: 10.5671
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7605571332984283666, guid: bc77fc4360cf7554d882153c57d02f91, type: 3}
propertyPath: m_IsActive