Brown, Caleb M 63b72c0ee4 Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step ... # Conflicts: # Assets/Prefabs/Cartridge-Interactable.prefab # Assets/Scenes/BasicScene.unity		2023-11-07 13:50:44 -05:00
..
BasicScene	Updated lighting	2023-11-06 07:20:30 -05:00
SampleScene	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
TestScene	Updated room model and lighting	2023-11-03 14:14:26 -04:00
BasicScene.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
BasicScene.unity	Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step	2023-11-07 13:50:44 -05:00
BasicScene.unity.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
explosionTesting.unity	callout fix	2023-11-03 15:49:09 -04:00
explosionTesting.unity.meta	added explosion animations and part label scripts	2023-11-02 22:14:02 -04:00
SampleScene.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
SampleScene.unity	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
SampleScene.unity.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
TestScene.meta	Updated room model and lighting	2023-11-03 14:14:26 -04:00
TestScene.unity	Reorganized prefabs and test scenes.	2023-11-07 13:22:50 -05:00
TestScene.unity.meta	Updated room model and lighting	2023-11-03 14:14:26 -04:00