Commit Graph

13 Commits

Author SHA1 Message Date
Joshua Latham
e39ed3d013 Reorganized prefabs and test scenes. 2023-11-07 13:22:50 -05:00
Joshua Latham
d72630105f Fixed teleportation. Hands are offset from the head now though. 2023-11-06 23:32:54 -05:00
Joshua Latham
6cdf735212 Updates to the XR Rig to get locomotion working 2023-11-06 13:27:47 -05:00
Joshua Latham
521fee9da3 Added XRI Examples scene for testing hands implementation 2023-11-06 11:42:08 -05:00
Joshua Latham
cfd3ac4705 Re-imported hands samples. Updated standard materials to URP versions. 2023-11-06 10:29:26 -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
a6a393064d Converted to names in asmdef instead of GUIDs 2023-11-03 20:49:42 -04:00
Joshua Latham
b3b8bb5c08 Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Brown, Caleb M
131ce9532c MAVRIC-2127: Updated imported package samples 2023-11-03 12:39:09 -04:00
Brown, Caleb M
20b62c47bb MAVRIC-2127: Added Slide interaction to the Thumbwheel 2023-11-03 12:34:22 -04:00
Joshua Latham
1f2b5d7afc Fixed non URP materials 2023-11-03 10:37:00 -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