UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-23 23:58:36 -05:00
Code Issues Packages Projects Releases Wiki Activity
f71f90aac0
Stratasys-450mc-VR/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo
History
Joshua Latham f71f90aac0 Merge branch 'feature/MAVRIC-2127_Thumbwheel' into feature/unity-xr-hands 
# Conflicts:
#	Assets/Samples/XR Hands.meta
#	Assets/Samples/XR Interaction Toolkit/2.4.3.meta
#	Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta
#	Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta
#	Assets/Samples/XR Interaction Toolkit/2.4.3/Tunneling Vignette/TunnelingVignette.mat.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta
#	Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta
#	Packages/manifest.json
#	Packages/packages-lock.json
2023-11-03 23:38:31 -04:00
..
AffordanceThemes Re-updating XR package versions 2023-11-03 20:39:33 -04:00
DatumPresets Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Editor Re-updating XR package versions 2023-11-03 20:39:33 -04:00
HandsDemoSceneAssets Merge branch 'feature/MAVRIC-2127_Thumbwheel' into feature/unity-xr-hands 2023-11-03 23:38:31 -04:00
Materials Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Models Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Prefabs Merge branch 'feature/MAVRIC-2127_Thumbwheel' into feature/unity-xr-hands 2023-11-03 23:38:31 -04:00
Scripts Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Shaders Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Textures Re-updating XR package versions 2023-11-03 20:39:33 -04:00
.sample.json Re-updating XR package versions 2023-11-03 20:39:33 -04:00
AffordanceThemes.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
DatumPresets.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Editor.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
HandsDemoScene.unity Re-updating XR package versions 2023-11-03 20:39:33 -04:00
HandsDemoScene.unity.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
HandsDemoSceneAssets.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Materials.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Models.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Prefabs.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Scripts.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Shaders.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Textures.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef.meta Re-updating XR package versions 2023-11-03 20:39:33 -04:00