Brown, Caleb M
|
3f79ee8d65
|
MAVRIC-2175: Added the Final step and wired it into the guide canister animation controller
|
2023-11-07 19:49:15 -05:00 |
|
Brown, Caleb M
|
54510b09ae
|
MAVIRC-2175: Updated Thumbwheel step logic to use the new thumbwheel step
|
2023-11-07 19:22:51 -05:00 |
|
Brown, Caleb M
|
bd2f57015b
|
MAVRIC-2175: Updated Video (Raw Image) aspect ratio
|
2023-11-07 19:18:20 -05:00 |
|
Brown, Caleb M
|
350d012cb8
|
MAVRIC-2175: Updated UI Buttons
|
2023-11-07 19:17:30 -05:00 |
|
Brown, Caleb M
|
9795b0e526
|
Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step
|
2023-11-07 19:11:20 -05:00 |
|
Noah Calderon
|
afab179b4c
|
Merge pull request 'FIlament Step' (#12) from feature/Filament-Step into integration/VR-Updates
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/12
|
2023-11-07 20:37:20 +00:00 |
|
Calderon, Noah
|
8f52817ab7
|
MAVRIC-2174 update reset
|
2023-11-07 15:13:12 -05:00 |
|
Brown, Caleb M
|
547015e032
|
MAVRIC-2175: Fix for inside pad physics being mean
|
2023-11-07 14:18:01 -05:00 |
|
Abraham Blain
|
b3992101ba
|
Merge remote-tracking branch 'origin/feature/MAVRIC-2174_Update_Info_Board' into feature/Filament-Step
|
2023-11-07 13:59:00 -05:00 |
|
Abraham Blain
|
37213a3c3f
|
Merge remote-tracking branch 'origin/development' into feature/Filament-Step
|
2023-11-07 13:58:42 -05:00 |
|
Brown, Caleb M
|
63b72c0ee4
|
Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step
# Conflicts:
# Assets/Prefabs/Cartridge-Interactable.prefab
# Assets/Scenes/BasicScene.unity
|
2023-11-07 13:50:44 -05:00 |
|
Calderon, Noah
|
ec8bbc9e52
|
Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board
|
2023-11-07 13:46:11 -05:00 |
|
Calderon, Noah
|
fcca16e15f
|
MAVRIC-2174 update buttons
|
2023-11-07 13:43:15 -05:00 |
|
Joshua Latham
|
e39ed3d013
|
Reorganized prefabs and test scenes.
|
2023-11-07 13:22:50 -05:00 |
|
Brown, Caleb M
|
640c5b5c9d
|
MAVRIC-2175: [WIP] Trying to figure out a solid way to trigger the next step channel via a socket
|
2023-11-07 12:04:58 -05:00 |
|
Abraham Blain
|
7b4d44f635
|
added step to procedure
|
2023-11-07 11:40:10 -05:00 |
|
Abraham Blain
|
d35d199ec9
|
Merge remote-tracking branch 'origin/feature/MAVRIC-2174_Update_Info_Board' into feature/Filament-Step
|
2023-11-07 11:31:05 -05:00 |
|
Abraham Blain
|
3d136ce142
|
created thumbwheel step and animation
|
2023-11-07 11:30:22 -05:00 |
|
Brown, Caleb M
|
445f5a3f1a
|
MAVRIC-2175: [WIP] Updated how interactables and sockets are getting locked and unlocked
|
2023-11-07 10:52:49 -05:00 |
|
Joshua Latham
|
d72630105f
|
Fixed teleportation. Hands are offset from the head now though.
|
2023-11-06 23:32:54 -05:00 |
|
Calderon, Noah
|
2bee7c6589
|
MAVRIC-2174 fixed reset
|
2023-11-06 23:26:30 -05:00 |
|
Calderon, Noah
|
05b7d53bda
|
MAVRIC-2174 added buttons
|
2023-11-06 23:16:52 -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 |
|
Brown, Caleb M
|
1d0828181d
|
mavric-2175: [WIP] Trying to figure out how to control what interactable/socket is "enabled" at a specific step
|
2023-11-06 19:46:08 -05:00 |
|
Brown, Caleb M
|
b3d1f45f0c
|
MAVRIC-2175: FIgured out most of the grab interactions/socket interactions should work
|
2023-11-06 14:46:23 -05:00 |
|
Joshua Latham
|
6cdf735212
|
Updates to the XR Rig to get locomotion working
|
2023-11-06 13:27:47 -05:00 |
|
Joshua Latham
|
190506bc46
|
Created MAVRIC XR Hands Origing rig prefab
|
2023-11-06 12:02:30 -05:00 |
|
Joshua Latham
|
a99f7bccad
|
Added prefabe with hands for player
|
2023-11-06 10:22:50 -05:00 |
|
Noah
|
d443195b6e
|
MAVRIC-2174 added logo animation
|
2023-11-06 07:46:34 -05:00 |
|
Noah
|
cfbbc7f1c7
|
Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board
|
2023-11-05 22:06:15 -05:00 |
|
Noah
|
b1fb92807f
|
MAVRIC-2174 save point
|
2023-11-05 22:05:29 -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 |
|
Brown, Caleb M
|
f54e7df134
|
MAVRIC-2127: Updated the scale direction of the filament
|
2023-11-03 15:58:14 -04:00 |
|
Abraham Blain
|
b0fa3f5638
|
callout fix
|
2023-11-03 15:49:09 -04:00 |
|
Abraham Blain
|
8533206650
|
another callout position update
|
2023-11-03 15:37:29 -04:00 |
|
Abraham Blain
|
d7b888e528
|
adjusted callout offset
|
2023-11-03 15:20:50 -04:00 |
|
Abraham Blain
|
619762e2b3
|
swapped labels and added explosion events
|
2023-11-03 15:16:36 -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 |
|
Abraham Blain
|
c2c71370ec
|
added part explosion step to procedure
|
2023-11-03 09:21:55 -04:00 |
|
Abraham Blain
|
b5aaa80171
|
added namespaces and part label manager to guide model
|
2023-11-02 22:21:25 -04:00 |
|
Abraham Blain
|
fa394a034a
|
added explosion animations and part label scripts
|
2023-11-02 22:14:02 -04:00 |
|
Noah
|
4ac85495a2
|
MAVRIC-2110 fixed animation and added first step
|
2023-11-01 16:37:35 -04:00 |
|