Merge branch 'feature/level-design' into 'main'

collision cleanup, fixed softlock

See merge request kernel-panic/revival!96

game/Assets/Prefabs/Environment/Temple.prefab

@@ -1675,6 +1675,45 @@ Transform:
   m_Father: {fileID: 3540232316517503763}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4364753978283729030
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4562910595573208602}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 4.666991, y: 0.34131902, z: 4.009562}
+  m_Center: {x: -1.6665359, y: 0.17065999, z: 2.0048137}
+--- !u!65 &6358645084371860380
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4562910595573208602}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 4.665758, y: 2.9253898, z: 0.36341703}
+  m_Center: {x: -1.6672233, y: 1.4626977, z: 0.18173182}
+--- !u!65 &7308710939404557630
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4562910595573208602}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 4.000002, y: 0.34131902, z: 4.009562}
+  m_Center: {x: -2.0000048, y: 2.75, z: 2.0047834}
 --- !u!1 &5317958019843067266
 GameObject:
   m_ObjectHideFlags: 0
@@ -4432,6 +4471,30 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3441540937267448070}
     m_Modifications:
+    - target: {fileID: 8007785167384430606, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+      propertyPath: m_Size.x
+      value: 4.664349
+      objectReference: {fileID: 0}
+    - target: {fileID: 8007785167384430606, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+      propertyPath: m_Size.y
+      value: 2.9271045
+      objectReference: {fileID: 0}
+    - target: {fileID: 8007785167384430606, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+      propertyPath: m_Size.z
+      value: 0.3302008
+      objectReference: {fileID: 0}
+    - target: {fileID: 8007785167384430606, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+      propertyPath: m_Center.x
+      value: -1.6679622
+      objectReference: {fileID: 0}
+    - target: {fileID: 8007785167384430606, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+      propertyPath: m_Center.y
+      value: 1.4635584
+      objectReference: {fileID: 0}
+    - target: {fileID: 8007785167384430606, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+      propertyPath: m_Center.z
+      value: 3.8447158
+      objectReference: {fileID: 0}
     - target: {fileID: 8007785167829733921, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
       propertyPath: m_RootOrder
       value: 2
@@ -4482,6 +4545,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+--- !u!1 &4562910595573208602 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7196813774292645716, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}
+  m_PrefabInstance: {fileID: 6679543024484622670}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3716559117116650351 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8007785167829733921, guid: 005de1e48ae803d45b19eefe2f9c4797, type: 3}