Calderon, Noah
|
2bee7c6589
|
MAVRIC-2174 fixed reset
|
2023-11-06 23:26:30 -05:00 |
|
Calderon, Noah
|
cea07721b6
|
Merge branch 'feature/unity-xr-hands' into feature/MAVRIC-2174_Update_Info_Board
|
2023-11-06 22:30:16 -05:00 |
|
Noah
|
cfbbc7f1c7
|
Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board
|
2023-11-05 22:06:15 -05:00 |
|
Joshua Latham
|
15f5725e8e
|
Merge branch 'development' into feature/unity-xr-hands
|
2023-11-03 23:40:04 -04: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
|
97364e0e5a
|
Merge branch 'development' into feature/MAVRIC-2127_Thumbwheel
|
2023-11-03 21:20:05 +00:00 |
|
Noah
|
6b131539d8
|
MAVRIC-2174 save point
|
2023-11-03 16:03:13 -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 |
|
Abraham Blain
|
6e0f26ed77
|
Merge remote-tracking branch 'origin/development' into feature/Explosion-Animation
|
2023-11-03 12:53:26 -04:00 |
|
Brown, Caleb M
|
20197e29a1
|
Merge remote-tracking branch 'origin/development' into feature/MAVRIC-2127_Thumbwheel
|
2023-11-03 12:42:32 -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 |
|
Joshua Latham
|
b760ee9526
|
Material updates
|
2023-11-03 11:11:02 -04:00 |
|
Noah
|
009821e39c
|
MAVRIC Update tape and can with new materials and fix plug animation
|
2023-11-03 08:22:01 -04:00 |
|
Abraham Blain
|
b5aaa80171
|
added namespaces and part label manager to guide model
|
2023-11-02 22:21:25 -04:00 |
|
Noah
|
f73abd1d4e
|
MAVRIC-2110 Changed animations
|
2023-11-02 10:10:20 -04:00 |
|
Noah
|
4ac85495a2
|
MAVRIC-2110 fixed animation and added first step
|
2023-11-01 16:37:35 -04:00 |
|
Noah
|
33ae462d75
|
MAVRIC changing out spool
|
2023-11-01 12:19:10 -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 |
|