UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-22 15:18:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
111 Commits 7 Branches 1 Tag 766 MiB
83a22d6587
Commit Graph

88 Commits

Author SHA1 Message Date
Joshua Latham
77c551632d Added stick movement to left hand to adjust position and hopefullly fixed buttons in stand alone build 2023-11-08 11:56:01 -05:00
Brown, Caleb M
94ae755b93 HOTFIX: Reverted "static" objects that shouldn't be static 2023-11-08 08:00:44 -05:00
Brown, Caleb M
56908d5690 HOTFIX: UI Buttons 2023-11-08 07:37:05 -05:00
Joshua Latham
a62d58519f Updated lighting 2023-11-08 01:10:12 -05:00
Joshua Latham
96bf6a2156 Stratasys MC450 VR v1.0 2023-11-08 00:49:01 -05:00
Joshua Latham
67b0192cb4 Merge branch 'development' into feature/fortus-room 2023-11-07 22:53:52 -05:00
Joshua Latham
03606d3b62 Merge branch 'development' into feature/fortus-room 2023-11-07 22:02:44 -05:00
Joshua Latham
554d7b5caa Added furnishings prefabs, models, and materials 2023-11-07 21:36:29 -05:00
Brown, Caleb M
288e86f49b MAVRIC-2175: Updated final step text name and descriptions 2023-11-07 19:50:57 -05:00
Brown, Caleb M
7e3bbe2b03 MAVIRC-2175: added some padding to the video player 2023-11-07 19:49:44 -05:00
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
Joshua Latham
cc0145e7d6 Merge branch 'development' into feature/fortus-room 2023-11-07 19:35:22 -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
Joshua Latham
323a6b5b86 First pass at updated room design 2023-11-07 18:37:30 -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
249bccbd01 MAVRIC-2174 fixed plug animation alignment 2023-11-07 15:25:54 -05:00
Calderon, Noah
8f52817ab7 MAVRIC-2174 update reset 2023-11-07 15:13:12 -05:00
Brown, Caleb M
c7abf5fb73 MAVRIC-2175: Updated origin position to be closer to the table 2023-11-07 14:23:44 -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
441fb7aedc MAVRIC-2175: Added a next step button to the scene because I can't get the socket logic working properly 2023-11-07 12:05:41 -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
0aa1361a04 Updated imported sample with new MAVRIX XR rig prefab 2023-11-06 12:40:10 -05:00
Joshua Latham
190506bc46 Created MAVRIC XR Hands Origing rig prefab 2023-11-06 12:02:30 -05:00
Joshua Latham
521fee9da3 Added XRI Examples scene for testing hands implementation 2023-11-06 11:42:08 -05:00
Joshua Latham
cfd3ac4705 Re-imported hands samples. Updated standard materials to URP versions. 2023-11-06 10:29:26 -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
Joshua Latham
d7c13a014a Updated lighting 2023-11-06 07:20:30 -05:00
Noah
a0c4252d4d MAVRIC-2174 fixed labels not disappearing 2023-11-05 22:18:06 -05:00
Noah
cfbbc7f1c7 Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board 2023-11-05 22:06:15 -05:00