Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone

# Conflicts: # Assets/Scenes/Story1.unity
2026-08-20 11:32:10 +02:00
parent 0597756f41 b8d1d2d76a
commit 392d23632b
8 changed files with 107 additions and 112 deletions
@@ -730,11 +730,11 @@ CapsuleCollider:
    serializedVersion: 2
    m_Bits: 0
  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
+  m_IsTrigger: 0
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 2
  m_Radius: 0.5000001
  m_Height: 2
  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
@@ -0,0 +1,16 @@
+diff a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab	(rejected hunks)
+@@ -730,11 +730,11 @@
+     serializedVersion: 2
+     m_Bits: 0
+   m_LayerOverridePriority: 0
+-  m_IsTrigger: 0
+  m_IsTrigger: 1
+   m_ProvidesContacts: 0
+   m_Enabled: 1
+   serializedVersion: 2
+   m_Radius: 0.5000001
+   m_Height: 2
+   m_Direction: 1
+-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
+\ No newline at end of file
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}