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
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
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
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
0882c6e866
BUGFIX: Fix for the InteractableLockingFilter blocking everything (including physics??) driven via the GrabInteractable when "locked"
2023-12-15 12:13:25 -05:00
Joshua Latham
96bf6a2156
Stratasys MC450 VR v1.0
2023-11-08 00:49:01 -05:00
Joshua Latham
554d7b5caa
Added furnishings prefabs, models, and materials
2023-11-07 21:36:29 -05:00
Joshua Latham
323a6b5b86
First pass at updated room design
2023-11-07 18:37:30 -05:00
Joshua Latham
e39ed3d013
Reorganized prefabs and test scenes.
2023-11-07 13:22:50 -05:00
Joshua Latham
9e1b249f4a
Updated room model and lighting
2023-11-03 14:14:26 -04:00
Joshua Latham
4a1f9ef79f
Added Fortus room model
2023-11-03 11:49:12 -04:00
Joshua Latham
1dea5a0c4c
Adding XR project and BasicScene for Stratasys development
2023-10-30 08:42:18 -04:00
