Commit Graph

4 Commits

Author SHA1 Message Date
Joshua Latham
a99f7bccad Added prefabe with hands for player 2023-11-06 10:22:50 -05:00
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
Joshua Latham
5bc27d80e7 Added Unity XR Hands package 2023-11-03 08:51:51 -04:00
Joshua Latham
1dea5a0c4c Adding XR project and BasicScene for Stratasys development 2023-10-30 08:42:18 -04:00