Commit Graph

11 Commits

Author SHA1 Message Date
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
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
Joshua Latham
a62d58519f Updated lighting 2023-11-08 01:10:12 -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
d7c13a014a Updated lighting 2023-11-06 07:20:30 -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