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
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
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
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
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
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
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
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
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
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
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
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
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
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
Abraham Blain
18b2466551
changed xrscroll to inherit baseinteractable
2023-11-14 14:53:07 -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
Brown, Caleb M
09a2094b5a
MAVRIC-2183: Prefab changes reflecting new property name
2023-11-10 15:23:46 -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
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
56908d5690
HOTFIX: UI Buttons
2023-11-08 07:37:05 -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
7e3bbe2b03
MAVIRC-2175: added some padding to the video player
2023-11-07 19:49:44 -05:00