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

# Conflicts: # Assets/Prefabs/AR.prefab # Assets/Prefabs/Pistole.prefab
2026-06-26 13:42:03 +02:00
parent e68e753523 f9295a93aa
commit 65e6ffed94
12 changed files with 869 additions and 130 deletions
@@ -27,7 +27,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3150477364047279588}
  serializedVersion: 2
+<<<<<<< HEAD
  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+=======
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+>>>>>>> f9295a93aa1ad4e11e0c2aca217f299e8ab071be
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.62523, y: 0.62523, z: 2.5534475}
  m_ConstrainProportionsScale: 0