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

221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kipplesnbits
b9e2b0a3c6 Revert "Adding new demo scene with controllers and hands working" 
This reverts commit 5a536c3a80.
 2025-01-17 10:57:15 -05:00
Kipplesnbits
5a536c3a80 Adding new demo scene with controllers and hands working 2025-01-17 10:56:53 -05:00
Joshua Latham
686d9e0614 Merge pull request 'feature/2196-poke-haptics-update' (#39) from feature/2196-poke-haptics-update into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/39
 2024-02-16 18:27:12 +00:00
Joshua Latham
b14ba06c1d Merge branch 'development' into feature/2196-poke-haptics-update 2024-02-16 18:05:44 +00:00
Joshua Latham
ea74e4eea4 Merge pull request 'feature/add-outline-to-object-on-hover' (#38) from feature/add-outline-to-object-on-hover into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/38
 2024-02-16 16:07:12 +00:00
Cody Wright
b16cf9d058 Merge branch 'feature/add-outline-to-object-on-hover' of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR into feature/2196-poke-haptics-update 2024-02-16 09:31:40 -05:00
Cody Wright
71a94ffd2e Updated the Hover Outline script 
removed the debug messages and moved the grabInteractable to awake
 2024-02-15 17:19:33 -05:00
Cody Wright
11b7a0b893 Updated the script and changed how the outline color is set 
Updated the script that Caleb provided and made updated to it so that the outline is added and removed from the cached color
 2024-02-15 16:16:04 -05:00
Cody Wright
40b3a47879 Removed outline from Flip_Pad_Pull_Out 
removed the outline scripts from the pull out pad as it is has an issue where it is being outlined before it is supposed to
 2024-02-15 11:54:26 -05:00
Cody Wright
0cecb6eb82 Merge branch 'feature/add-outline-to-object-on-hover' of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR into feature/2196-poke-haptics-update 2024-02-13 10:41:07 -05:00
Cody Wright
22018f9c4c Decreased button travel distance 
shortened the length of travel for the "next" and "reset" buttons
 2024-02-13 10:04:36 -05:00
Cody Wright
40dfa1f735 Added highlight to the flip pad rigidbody 
added the hight to the pad but the pad is being highlighted on steps when it should not be
 2024-02-09 17:23:50 -05:00
Cody Wright
d5f6d15c8a Added Highlight on hover to removeable objects 2024-02-09 15:36:34 -05:00
Joshua Latham
30114a97e7 Merge pull request 'feature/2188-Cannister-update' (#37) from feature/2188-Cannister-update into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/37
 2024-02-07 17:44:49 +00:00
Joshua Latham
6ce5777e65 Merge branch 'development' into feature/2188-Cannister-update 2024-02-07 17:03:23 +00:00
Joshua Latham
e890e8b61b Merge pull request 'bugfix/Fit-It-All-Walkup' (#36) from bugfix/Fit-It-All-Walkup into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/36
 2024-02-07 17:01:34 +00:00
Kip Taylor
e3c0feadb7 Checked overrides, runs well! 2024-02-07 10:30:24 -05:00
Kip Taylor
5d2284c395 moved objects and swapped containers 2024-02-07 10:23:41 -05:00
Kip Taylor
23eaf13cb5 Added Mavric Affordance 2024-02-07 09:34:35 -05:00
Kip Taylor
672c907fa7 Merge branch 'development' into bugfix/Fit-It-All-Walkup 2024-02-06 12:27:28 -05:00
Caleb Brown
a6a0eb2e79 Merge pull request 'feature/2248-switch-watch-hand' (#35) from feature/2248-switch-watch-hand into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/35
 2024-02-05 19:56:45 +00:00
Cody Wright
45aca88bb2 Made changes based on feedback 
Rewrote the code and changed the watch parents to take away the real time updates that were happing in previous version
 2024-02-02 14:42:49 -05:00
Cody Wright
2e28950d97 Fixed watch left wrist orientation 
fixed the watch orientation on the left hand so it faces the right way
 2024-02-01 15:51:35 -05:00
Kip Taylor
4d62d0d333 Merge branch 'bugfix/merge03' into bugfix/Fit-It-All-Walkup 
# Conflicts:
#	Assets/Prefabs/XR Rigs/Working/MAVRIC XR Hands Origin v2.prefab
#	Assets/Scenes/BasicScene.unity

- Fixed Override issues and now onto our prefabs
- All merged well and took my stuff aside from walls, colliders.
 2024-02-01 12:31:08 -05:00
Kip Taylor
f227150895 Merge branch 'bugfix/merge02' into bugfix/Fit-It-All-Walkup 
# Conflicts:
#	Assets/Scenes/BasicScene.unity

- Fixed overrides from prefab interactor to mav rig instead
- Yaml seemed to make the merge fine with no issues
 2024-02-01 12:11:08 -05:00
Kip Taylor
b8017b66b6 Merge branch 'bugfix/merge01' into bugfix/Fit-It-All-Walkup 
# Conflicts:
#	Assets/Scenes/BasicScene.unity

- Merged and functions, took FitItAll Side due the fixes solving this
 2024-02-01 12:05:49 -05:00
Kip Taylor
3155fb7f67 Merge remote-tracking branch 'origin/test/yaml-merge' into bugfix/Kip-Fix-It-All 
# Conflicts:
#	Assets/Prefabs/LabSpace.prefab
 2024-02-01 12:02:16 -05:00
Cody Wright
3f5c7ab5e9 WIP: Added Watch Swapping 
Added watch wrist swapping by using "Tab" on keyboard. Watch rotaion is 180 degrees off on the left wrist. Also need to set swapping wrists to controllers.
 2024-01-30 17:44:46 -05:00
Joshua Latham
53e24cbdb8 Merge pull request 'Fixed flip arm interaction' (#34) from bugfix/2251-Fix-flip-arm-pad-interactive into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/34
 2024-01-29 22:33:38 +00:00
Joshua Latham
e5f95fbbdb Merge branch 'development' into bugfix/2251-Fix-flip-arm-pad-interactive 2024-01-29 17:30:51 -05:00
Joshua Latham
fc3463ff68 Merge pull request 'Walls , objects, and teleportation' (#33) from 2256-Teleport-cleanup into development 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/33
 2024-01-29 22:22:05 +00: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
Kip Taylor
6a49066418 Merge branch 'development' into 2256-Teleport-cleanup 
# Conflicts:
#	Assets/Prefabs/LabSpace.prefab
#	Assets/Scenes/BasicScene.unity
 2024-01-26 10:32:24 -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
Kip Taylor
11487bde36 Updated height and overrides 
Added a fix for the camera offset to not be a giant but to match the normal height. Should be bettter and correct. Added overrides that were missed
 2024-01-25 15:24:17 -05:00
Kip Taylor
69d829b733 Added final colldier check 
Added collider to Object prefabs and ensured they are atached to prefab and not scene
 2024-01-25 11:40:46 -05:00
Kip Taylor
dcb7243df6 Walls , objects, and teleportation 
Added colliders to walls, objects , and doors. changed ray to B curve adn made it usable for very long distance.
** Small bug, sometimes the teleport function stops working after interacting with a collider.
 2024-01-25 11:23:59 -05: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