caleb-brown/UDRIGEEKCup2024
1
0
Fork 0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 07:08:51 -05:00
Code Releases Activity

Merge remote-tracking branch 'origin/feature/AR-Anchoring' into hotfix/kickout-hole

Browse Source 
# Conflicts:
#	Assets/Scenes/TestControls.unity
This commit is contained in:
cbrown 2024-04-16 17:02:04 -04:00
commit 88a97eef70
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Scenes/TestControls.unity
View File

@ -2240,7 +2240,7 @@ PrefabInstance:
- target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.95
value: 0.045
objectReference: {fileID: 0}
- target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747,
type: 3}
@ -2433,7 +2433,7 @@ Transform:
m_GameObject: {fileID: 1507380958}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4, y: -1, z: 0}
m_LocalPosition: {x: -4, y: 0, z: 0}
m_LocalScale: {x: 10, y: 0.1, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
@ -2658,7 +2658,7 @@ Transform:
m_GameObject: {fileID: 1752515851}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6, y: -1, z: 0}
m_LocalPosition: {x: 6, y: 0, z: 0}
m_LocalScale: {x: 10, y: 0.1, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4149,7 +4149,7 @@ Transform:
m_GameObject: {fileID: 2050288998095584909}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.23469917, y: -0.56, z: 1.5151435}
m_LocalPosition: {x: -0.23469917, y: 0.56, z: 1.5151435}
m_LocalScale: {x: 0.15, y: 0.5, z: 0.15}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4477,7 +4477,7 @@ Transform:
m_GameObject: {fileID: 7237674694152796921}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.323, y: -0.725, z: 0.3}
m_LocalPosition: {x: -0.18469918, y: 0.0737, z: 0.15}
m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
m_ConstrainProportionsScale: 0
m_Children: []

6
ProjectSettings/ProjectSettings.asset
View File

@ -140,11 +140,7 @@ PlayerSettings:
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.0.0
preloadedAssets:
- {fileID: 7409956309476867576, guid: 3fd4fc0127790db4bae83f7b77da8d45, type: 2}
- {fileID: 11400000, guid: c199e683398494f32b4cde18e73ab731, type: 2}
- {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
- {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3}
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1