eckertnoah/Unity3DRoom_MasterProject
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: eckertnoah:c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
Branches Tags
eckertnoah:master
...
compare: eckertnoah:f3d4a30be71f52cca3568415f58d07c2a5505674
Branches Tags
eckertnoah:master

2 Commits
c08f0d1ab0 ... f3d4a30be7

Author SHA1 Message Date
Noah Eckert
f3d4a30be7 Merge commit 'c08f0d1ab0094c178fc9b3e23d1980a4142d73cf' 
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
 2022-03-22 12:00:18 +01:00
Noah Eckert
66877872ab New Chances in Noah Scene 2022-03-22 11:51:55 +01:00
3 changed files with 1207 additions and 0 deletions
Show Stats Expand all files Collapse all files

1199
Assets/Scenes/Room Noah.unity
View File

File diff suppressed because it is too large Load Diff

5
ProjectSettings/EditorBuildSettings.asset
View File

@ -6,8 +6,13 @@ EditorBuildSettings:
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 1
<<<<<<< HEAD
path: Assets/Scenes/Room Noah.unity
guid: 61951a1951b1742eea6dd27420fae56b
=======
path: Assets/Scenes/Room Lisa.unity path: Assets/Scenes/Room Lisa.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab guid: 9fc0d4010bbf28b4594072e72b8655ab
>>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
m_configObjects: m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 49ee9a368d2424ce0a5faa9d0c644242, type: 2} Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 49ee9a368d2424ce0a5faa9d0c644242, type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: d4a8a8d4ef2d74adb9267620f3853997, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: d4a8a8d4ef2d74adb9267620f3853997, type: 2}

3
ProjectSettings/ProjectSettings.asset
View File

@ -138,7 +138,10 @@ PlayerSettings:
preloadedAssets: preloadedAssets:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
<<<<<<< HEAD
=======
- {fileID: 0} - {fileID: 0}
>>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1