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
151 Commits 7 Branches 1 Tag 766 MiB
7622b0fa8d
Commit Graph

151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ktaylor
7622b0fa8d Updating to 3.17 update 2024-01-18 14:27:13 -05:00
Joshua Latham
c4c28c542d Merge pull request 'feature/2195-Add-Wrist-Watch-To-XR-Toolkit' (#28) from feature/2195-Add-Wrist-Watch-To-XR-Toolkit into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/28
 2024-01-10 20:11:42 +00:00
Joshua Latham
04fb790995 Merge branch 'development' into feature/2195-Add-Wrist-Watch-To-XR-Toolkit 2024-01-10 19:53:25 +00:00
Cody Wright
b4656bf24a Fixed watch texture 
added the missing watch texture and corrected the watch orientation
 2024-01-09 15:38:27 -05:00
Cody Wright
2000dd89b7 Watch in position 
The watch is in the correct position and shows the time
 2024-01-09 13:22:13 -05:00
Brown, Caleb M
89b136ffab MAVRIC-2185: Fixed FlipArm door socket issue 2024-01-09 13:22:11 -05:00
Cody Wright
1ade2108d7 Updated watch model 
WIP: working on trying to move watch position to right wrist and follow its position and rotation
 2024-01-08 15:01:39 -05:00
Cody Wright
2316a316a0 Revert "Add Watch To Wrist" 
This reverts commit 7cbfb62cf4.
 2024-01-05 16:51:53 -05:00
Cody Wright
7cbfb62cf4 Add Watch To Wrist 
WIP: added watch to right hand but the origin for watch is off and causes the watch to be ofset from the wrist
 2024-01-05 12:43:58 -05:00
Joshua Latham
11c7f59c9e Merge pull request 'Add Gravity to Removed Parts' (#25) from feature/2185-Add-gravity-to-removed-parts into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/25
 2023-12-21 20:03:38 +00:00
Brown, Caleb M
453206a0f7 MAVRIC-2185: Fixed FlipArm door socket issue 2023-12-21 14:23:51 -05:00
Cody Wright
34557c7b13 Applied changed to the Cartridge_V3 Variant Interactable.prefab 
Applied the made changes to the parts that are affected by gravity on the cartridge
 2023-12-15 16:11:42 -05:00
Caleb Brown
9779f35d48 Merge pull request 'bugfix/MAVRIC-2185_Fix-Interactable-Locking-Filter' (#27) from bugfix/MAVRIC-2185_Fix-Interactable-Locking-Filter into feature/2185-Add-gravity-to-removed-parts 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/27
 2023-12-15 20:38:21 +00:00
Brown, Caleb M
ea3eaa6e03 BUGFIX: Fixed Rigidbody Pad to be socketed on Active 2023-12-15 12:31:30 -05:00
Brown, Caleb M
0882c6e866 BUGFIX: Fix for the InteractableLockingFilter blocking everything (including physics??) driven via the GrabInteractable when "locked" 2023-12-15 12:13:25 -05:00
Cody Wright
45bb69ff56 Add Gravity to Removed Parts 
Added gravity to the clip, CanisterTape, plug, and Flip_Pad_Pull_Out (Rigidbody)
 2023-12-13 17:09:22 -05:00
Joshua Latham
ae0e8ce49a Merge pull request 'Bugfix: Thumbwheel Scrolling' (#24) from bugfix/Thumbwheel-Scroll into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/24
 2023-11-15 21:08:25 +00:00
Joshua Latham
84128228f9 Merge branch 'development' into bugfix/Thumbwheel-Scroll 2023-11-15 19:41:00 +00:00
Joshua Latham
c17ec76197 Merge pull request 'Fixes for hand ray interactors' (#23) from feature/MAVRIC-2181-hands into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/23
 2023-11-15 18:21:58 +00:00
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
c7d4d4efbb Merge pull request 'bugfix/MAVRIC-2183_Flip-Arm-Socket-ZFighting' (#22) from bugfix/MAVRIC-2183_Flip-Arm-Socket-ZFighting into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/22
 2023-11-10 21:56:25 +00: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
Joshua Latham
5eb30b2b54 Merge pull request 'MAVRIC-2178: Socket Fixes' (#21) from bugfix/MAVRIC-2178_Socket-Fixes into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/21
 2023-11-10 17:16:27 +00: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
Joshua Latham
59db635956 Merge pull request 'MAVRIC-2176: Updated Next/Reset UI Buttons depress distance, rotation, and scale' (#20) from bugfix/MAVRIC-2176_UI-Buttons into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/20
 2023-11-09 19:51:42 +00: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
Caleb Brown
c42919c980 Merge pull request 'HOTFIX: Added stick movement to left hand to adjust position and hopefully fixed buttons in stand alone build' (#18) from hotfix/movement-buttons into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/18
 2023-11-09 11:44:42 +00: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
Joshua Latham
981d40e6fd Merge pull request 'feature/fortus-room' (#15) from feature/fortus-room into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/15
 2023-11-08 15:43:49 +00:00
Joshua Latham
b7e84ce65b Merge pull request 'HOTFIX: UI Buttons & Static objects fixes' (#17) from hotfix/UI-Buttons-Static-Objects-Fix into feature/fortus-room 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/17
 2023-11-08 15:41:42 +00: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