final merged project marlon + chrigi working sweet and smooth <3

This commit is contained in:
Marlon Portmann committed 2023-01-18 18:29:30 +01:00
1 parent e1cddf3e0d
commit d2dc155f53
130 files changed
+17237 -993

No files matched your search

+2 -2
View File
@@ -14,7 +14,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity
guid: 1ce274141f4a8413f84aac2d72153b9d
- enabled: 1
- enabled: 0
path: Assets/Assets/00_Shared/00_Scenes/03_AbstractRoom_2.unity
guid: 614a21c6e512d46c9abeff072624cfa1
- enabled: 0
@@ -23,7 +23,7 @@ EditorBuildSettings:
- enabled: 0
path: Assets/Assets/00_Shared/00_Scenes/05_AbstractRoom_3.unity
guid: f949f92248c074449b7379df607e490e
- enabled: 0
- enabled: 1
path: Assets/Assets/00_Shared/00_Scenes/06_Chury.unity
guid: 96b41c7ba99f34f4686d0bf4889831ed
m_configObjects:
+5
View File
@@ -255,6 +255,11 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
+2
View File
@@ -9,6 +9,8 @@ TagManager:
- leftHand
- rightHand
- coordinator
- bohrungStarten
- sceneButtons
layers:
- Default
- TransparentFX