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 |
|
Brown, Caleb M
|
f54e7df134
|
MAVRIC-2127: Updated the scale direction of the filament
|
2023-11-03 15:58:14 -04:00 |
|
Joshua Latham
|
9e1b249f4a
|
Updated room model and lighting
|
2023-11-03 14:14:26 -04:00 |
|
Brown, Caleb M
|
5268622fc7
|
MAVRIC-2127: Added a capsule that scales in the direction ot the thumbwheel
|
2023-11-03 13:38:36 -04:00 |
|
Brown, Caleb M
|
9e8291b686
|
MAVIRC-2127: Moved a component
|
2023-11-03 12:41:55 -04:00 |
|
Brown, Caleb M
|
eebda1a48a
|
MAVRIC-2127: Fixed missing scripts
|
2023-11-03 12:38:48 -04:00 |
|
Brown, Caleb M
|
20b62c47bb
|
MAVRIC-2127: Added Slide interaction to the Thumbwheel
|
2023-11-03 12:34:22 -04:00 |
|
Joshua Latham
|
4a1f9ef79f
|
Added Fortus room model
|
2023-11-03 11:49:12 -04:00 |
|
Noah
|
4ac85495a2
|
MAVRIC-2110 fixed animation and added first step
|
2023-11-01 16:37:35 -04:00 |
|
Noah
|
bab3773862
|
added model and prefabs
|
2023-11-01 10:51:29 -04:00 |
|
Joshua Latham
|
1dea5a0c4c
|
Adding XR project and BasicScene for Stratasys development
|
2023-10-30 08:42:18 -04:00 |
|