Merge remote-tracking branch 'Absinthe_XR/master'
# Conflicts: # Assets/Scenes/Absinte_Escape.unity # ProjectSettings/ProjectSettings.asset
This commit is contained in:
commit
a3924c153e
6 files changed
+105
-104
No files matched your search
@@ -4,7 +4,10 @@
|
||||
EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes: []
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Absinte_Escape.unity
|
||||
guid: eb8d14f7a54574c6fbd4b00187faf36a
|
||||
m_configObjects:
|
||||
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 81c8a0303afa444f4b774118d633d797, type: 2}
|
||||
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 1ca4f6c6b67ac4a4aa3419bd5149ab45, type: 2}
|
||||
@@ -141,6 +141,7 @@ PlayerSettings:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
@@ -149,6 +150,8 @@ PlayerSettings:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
=======
|
||||
>>>>>>> Absinthe_XR/master
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
|
||||
Reference in new issue
Block a user