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
..
Loaders	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Settings	Merge branch 'feature/MAVRIC-2127_Thumbwheel' into feature/unity-xr-hands	2023-11-03 23:38:31 -04:00
Loaders.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Settings.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
XRGeneralSettings.asset	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
XRGeneralSettings.asset.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00