Archived
final marlon scene before merge with christoph
This commit is contained in:
1 parent
4d0cb713d9
commit
ba955a8824
37 files changed
+17447
-614
No files matched your search
@@ -8,13 +8,13 @@ EditorBuildSettings:
|
||||
- enabled: 0
|
||||
path:
|
||||
guid: 00000000000000000000000000000000
|
||||
- enabled: 0
|
||||
- enabled: 1
|
||||
path: Assets/Assets/00_Shared/00_Scenes/01_AbstractRoom_1.unity
|
||||
guid: 6231fc187659a457a8702396b5a4929d
|
||||
- enabled: 1
|
||||
path: Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity
|
||||
guid: 1ce274141f4a8413f84aac2d72153b9d
|
||||
- enabled: 0
|
||||
- enabled: 1
|
||||
path: Assets/Assets/00_Shared/00_Scenes/03_AbstractRoom_2.unity
|
||||
guid: 614a21c6e512d46c9abeff072624cfa1
|
||||
- enabled: 0
|
||||
|
||||
@@ -240,6 +240,23 @@ PlayerSettings:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 102911504429780127, guid: e006f1e7563d8404b9ee5d6fcdabceb4, type: 2}
|
||||
- {fileID: 11400000, guid: 53647b0a2a9724adc8c66ce13d1a7ed4, type: 2}
|
||||
- {fileID: 0}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
|
||||
@@ -8,11 +8,12 @@ TagManager:
|
||||
- controlPanel
|
||||
- leftHand
|
||||
- rightHand
|
||||
- coordinator
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
- Ignore Raycast
|
||||
-
|
||||
- no post
|
||||
- Water
|
||||
- UI
|
||||
-
|
||||
|
||||
Reference in new issue
Block a user