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
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
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
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
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
fbd34cb9dc
Update to 3.17 Unity version
...
Updated to 3.17 and opened project
2024-01-18 14:33:32 -05:00
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
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
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
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
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
bb85b2ab81
Checking
...
Setup getting it functioning, works
added the sdk fix
2024-01-05 16:00:12 -05:00
0df17c71f0
Revert "Merge remote-tracking branch 'origin/development' into test/input-test"
...
This reverts commit Package issues
c81cd6d2af426c11863a
2024-01-05 15:25:48 -05:00
c81cd6d2af
Merge remote-tracking branch 'origin/development' into test/input-test
...
Merging input and development
2024-01-05 14:55:09 -05:00
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
