Merge commit 'c08f0d1ab0094c178fc9b3e23d1980a4142d73cf'
# Conflicts: # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectSettings.asset
This commit is contained in:
commit
f3d4a30be7
18 files changed
+1853
-268
No files matched your search
@@ -6,8 +6,13 @@ EditorBuildSettings:
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
<<<<<<< HEAD
|
||||
path: Assets/Scenes/Room Noah.unity
|
||||
guid: 61951a1951b1742eea6dd27420fae56b
|
||||
=======
|
||||
path: Assets/Scenes/Room Lisa.unity
|
||||
guid: 9fc0d4010bbf28b4594072e72b8655ab
|
||||
>>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
|
||||
m_configObjects:
|
||||
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 49ee9a368d2424ce0a5faa9d0c644242, type: 2}
|
||||
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: d4a8a8d4ef2d74adb9267620f3853997, type: 2}
|
||||
@@ -138,6 +138,10 @@ PlayerSettings:
|
||||
preloadedAssets:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
- {fileID: 0}
|
||||
>>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
@@ -237,7 +241,7 @@ PlayerSettings:
|
||||
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
|
||||
templatePackageId: com.unity.template.3d@5.0.4
|
||||
templateDefaultScene: Assets/Scenes/SampleScene.unity
|
||||
useCustomMainManifest: 0
|
||||
useCustomMainManifest: 1
|
||||
useCustomLauncherManifest: 0
|
||||
useCustomMainGradleTemplate: 0
|
||||
useCustomLauncherGradleManifest: 0
|
||||
|
||||
Reference in new issue
Block a user