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
187 Commits 7 Branches 1 Tag 766 MiB
e5f95fbbdb
Commit Graph

187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Latham
e5f95fbbdb Merge branch 'development' into bugfix/2251-Fix-flip-arm-pad-interactive 2024-01-29 17:30:51 -05:00
Cody Wright
843f229c5f Fixed flip arm interaction 
Within the LabSpace prefab, the Cartridge_V3's flip_pad_pull_out (rigidbody) was not locked for the XR Interactable Locking Filter (Script) which was causing the pad to be inertacted with on any step but the step to move it.
 2024-01-29 11:52:00 -05:00
Joshua Latham
bb883faecc Merge pull request 'feature/2177-Update-Lighting' (#30) from feature/2177-Update-Lighting into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/30
 2024-01-26 14:21:43 +00:00
Cody Wright
57acd53a68 Merge branch 'development' into feature/2177-Update-Lighting 
# Conflicts:
#	Assets/Scenes/BasicScene.unity
 2024-01-25 09:20:31 -05:00
Joshua Latham
f1c86606bd Merge pull request 'bugfix/2204-Fix-Teleportation-On-Vive' (#32) from bugfix/2204-Fix-Teleportation-On-Vive into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/32
 2024-01-24 19:08:08 +00:00
Cody Wright
97bc98470b Merge branch 'development' into feature/2177-Update-Lighting 
# Conflicts:
#	Assets/Prefabs/LabSpace.prefab
#	Assets/Scenes/BasicScene.unity
#	Assets/Scenes/BasicScene/LightingData.asset
#	Assets/Scenes/BasicScene/Lightmap-0_comp_dir.png
#	Assets/Scenes/BasicScene/Lightmap-0_comp_light.exr
#	Assets/Scenes/BasicScene/Lightmap-1_comp_dir.png
#	Assets/Scenes/BasicScene/Lightmap-1_comp_light.exr
#	Assets/Scenes/BasicScene/Lightmap-2_comp_dir.png
#	Assets/Scenes/BasicScene/Lightmap-2_comp_light.exr
#	Assets/Scenes/BasicScene/ReflectionProbe-0.exr
 2024-01-24 11:52:18 -05:00
kip
63271ac1b4 Merge branch 'development' into bugfix/2204-Fix-Teleportation-On-Vive 
Fixed are
Added mask to teleportation are to teleport , not nothing
Fully Functions
 2024-01-24 11:21:44 -05:00
kip
fdb8699737 Hand tracking 
Added fields and tracking with references so teleport works from right hand not shoudler
 2024-01-24 10:53:28 -05:00
kip
f8e93bec59 Fixed ray showing up 
Ray now shows up , had to move the ray interactor a tad
 2024-01-23 16:52:27 -05:00
Joshua Latham
d94fef0e9f Merge pull request 'Update to 3.17 Unity version and merge to development' (#31) from Featur/Update-to-3.17 into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/31
 2024-01-22 13:55:17 +00:00
kip
aefb1c6e2c Fixed teleportation bug 
the teleportation now functions
Issues needed for next PR
- Workout the ray, distance and fix its locked state on distance from target
- Make walls and other objects non teleportable through
- Did not do any ui/ux / ease of use , saving that for next PR as to limit amount of possible bugs or changes
 2024-01-22 08:12:55 -05:00
Ktaylor
fbd34cb9dc Update to 3.17 Unity version 
Updated to 3.17 and opened project
 2024-01-18 14:33:32 -05:00
Ktaylor
7622b0fa8d Updating to 3.17 update 2024-01-18 14:27:13 -05:00
Cody Wright
e81157c4e2 updated baked light map of light probs 
Baked the light map using the added light probs in the scene
 2024-01-18 11:01:41 -05:00
Cody Wright
bf6349ad24 WIP: Adding dynamic lights 
Added a light probe group and moved the nodes around the scene
 2024-01-16 15:18:22 -05:00
Joshua Latham
e6dd99f93d Merge pull request 'test/input-test' (#29) from test/input-test into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/29
 2024-01-12 21:37:23 +00:00
kiptaylor
dd089d2b22 Merge Conflicts & Override Changes 
Override changes for the entire room to ensure heirchary conflicts are solved and static / no static issues.
Deleted Emergency button
Rebaked lighting
Checked general static issues
Aside from canvas and buttons / backboard Did not mess with any other tutorial objects
 2024-01-12 14:23:01 -05:00
kiptaylor
ef61aae2ea Gravity fix 
Added gravity pre bags and scripts to current input post dev merge into input.
 2024-01-11 10:29:50 -05:00
kiptaylor
d1b85234a7 Merge branch 'development' into test/input-test 
All seems to be running correctly. Took my side of the changes for the two conflicts. Had to re add lfs files
 2024-01-11 09:45:52 -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
kiptaylor
87d73beaa9 Teleportation area fix 
Added a new teleportation area locked to right infront of strat
 2024-01-08 20:11:21 -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
kiptaylor
bb85b2ab81 Checking 
Setup getting it functioning, works
added the sdk fix
 2024-01-05 16:00:12 -05:00
kiptaylor
0df17c71f0 Revert "Merge remote-tracking branch 'origin/development' into test/input-test" 
This reverts commit Package issues 
c81cd6d2af, reversing
changes made to 426c11863a.
 2024-01-05 15:25:48 -05:00
kiptaylor
c81cd6d2af Merge remote-tracking branch 'origin/development' into test/input-test 
Merging input and development
 2024-01-05 14:55:09 -05:00
kiptaylor
426c11863a Version swap to planned version 
Version swap
 2024-01-05 12:51:29 -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
kiptaylor
68c32226ae Revert "FIxed sdk bug maybe" 
This reverts commit 2b38f54c89.
 2024-01-04 16:17:32 -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
Ktaylor
2b38f54c89 FIxed sdk bug maybe 2023-12-20 13:43:28 -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
Ktaylor
49c64eeb2f Fixed Scenes 
- added the scenes to separate them correctly
 2023-12-14 15:16:14 -05:00
Ktaylor
bddafeb271 Added locomotion input testing 
- Added teleport to new and old scene
- Bugged movement for controller
 2023-12-14 15:07:14 -05:00
Ktaylor
4fdfd60617 Added vscode ignore 2023-12-14 15:06:28 -05:00
Brown, Caleb M
7bfb0cd6ea Added XR Input Test scene 2023-12-14 14:29:27 -05:00
Brown, Caleb M
7414d78178 Removed Meta sdk 2023-12-14 14:28:48 -05:00
Brown, Caleb M
6bd191ee6b Removed ignored files/folders 2023-12-14 14:28:20 -05:00
Ktaylor
52c0391d44 Added build folder 2023-12-14 09:58:40 -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
Ktaylor
6d12cb95f3 Meta quest hands free 
- Added Hands free support
- Added pinch and touch and wheel support
- ALL but movement and teleporting works , still some small bugs other than that
 2023-12-13 11:47:31 -05:00
Ktaylor
12f35684f3 Added Locomotion and tele area 
- Retargeted a new teleport area
- Added a new locomotion area
 2023-12-04 07:32:17 -05:00