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
134 Commits 7 Branches 1 Tag 766 MiB
84128228f9
Commit Graph

107 Commits

Author SHA1 Message Date
Abraham Blain
18b2466551 changed xrscroll to inherit baseinteractable 2023-11-14 14:53:07 -05:00
Abraham Blain
21bffe68b7 re-enabled flip arm 2023-11-14 14:27:15 -05:00
Abraham Blain
1ed1b0b311 removed debug cubes, and refactored xrscroll event 2023-11-14 13:46:05 -05:00
Abraham Blain
1542176845 Simplified rotate and scale target classes, added to thumbwheel 2023-11-14 13:38:38 -05:00
Abraham Blain
cd5af28a09 created xr scroll component 2023-11-14 11:51:12 -05:00
Joshua Latham
96a98fbe03 Merge branch 'development' into feature/MAVRIC-2181-hands 2023-11-10 16:58:29 -05:00
Joshua Latham
08c6d19c77 Fixed direction and interaction of Ray interactors on hands. Continuing to work on teleportation 2023-11-10 16:50:09 -05:00
Brown, Caleb M
09a2094b5a MAVRIC-2183: Prefab changes reflecting new property name 2023-11-10 15:23:46 -05:00
Brown, Caleb M
6569dad7b6 MAVRIC-2183: Updated locking boolean to be a little bit better 2023-11-10 15:23:13 -05:00
Brown, Caleb M
f8ee8dcf35 MAVRIC-2183: Update to Odin Inspector 2023-11-10 15:15:01 -05:00
Brown, Caleb M
ba8304e6ff MAVRIC-2183: Refactor Lock property fix 2023-11-10 15:14:08 -05:00
Brown, Caleb M
f03fd52026 Merge branch 'development' into bugfix/MAVRIC-2183_Flip-Arm-Socket-ZFighting 
# Conflicts:
#	Assets/Prefabs/Cartridge-Interactable.prefab
 2023-11-10 12:32:27 -05:00
Brown, Caleb M
31b85dcef2 MAVRIC-2183: Updated class names to be more acturate as to what they do 2023-11-10 11:59:29 -05:00
Brown, Caleb M
8ce0ba02a2 MAVRIC-2183: Updated steps locking instructions 2023-11-10 11:39:19 -05:00
Brown, Caleb M
b1d8567a52 MAVIRC-2183: Fixed Locking Interactable Filter 2023-11-10 11:38:51 -05:00
Brown, Caleb M
2f81a2f972 MAVRIC-2183: Updated Flip Arm Door hover model scale 2023-11-10 09:24:14 -05:00
Brown, Caleb M
48f3c78be6 MAVRIC-2178: Removed more socket box colliders 2023-11-10 07:39:10 -05:00
Brown, Caleb M
87181066cd MAVRIC-2178: Updated socket triggers to be larger sphere colliders 2023-11-09 16:10:23 -05:00
Brown, Caleb M
4ef82cd7f3 MAVRIC-2176: Updated Next/Reset UI Buttons depress distance, rotation, and scale 2023-11-09 13:04:01 -05:00
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