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
..
BackBoard.prefab	added model and prefabs	2023-11-01 10:51:29 -04:00
BackBoard.prefab.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Cartridge-Guide.prefab	MAVRIC-2110 fixed animation and added first step	2023-11-01 16:37:35 -04:00
Cartridge-Guide.prefab.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Cartridge-Interactable.prefab	MAVRIC-2127: Updated the scale direction of the filament	2023-11-03 15:58:14 -04:00
Cartridge-Interactable.prefab.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
LabSpace.prefab	Updated room model and lighting	2023-11-03 14:14:26 -04:00
LabSpace.prefab.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Managers.prefab	added model and prefabs	2023-11-01 10:51:29 -04:00
Managers.prefab.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Table.prefab	added model and prefabs	2023-11-01 10:51:29 -04:00
Table.prefab.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
ThumbWheel.prefab	MAVRIC-2127: Added Slide interaction to the Thumbwheel	2023-11-03 12:34:22 -04:00
ThumbWheel.prefab.meta	MAVRIC-2127: Added Slide interaction to the Thumbwheel	2023-11-03 12:34:22 -04:00