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
..
BasicScene	Merge branch 'development' into feature/2177-Update-Lighting	2024-01-24 11:52:18 -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 'bugfix/merge02' into bugfix/Fit-It-All-Walkup	2024-02-01 12:11:08 -05:00
BasicScene.unity.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
explosionTesting.unity	created thumbwheel step and animation	2023-11-07 11:30:22 -05:00
explosionTesting.unity.meta	added explosion animations and part label scripts	2023-11-02 22:14:02 -04:00
Locomotion Test.unity	Added locomotion input testing	2023-12-14 15:07:14 -05:00
Locomotion Test.unity.meta	Added XR Input Test scene	2023-12-14 14:29:27 -05: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	Added some tracking and performance	2023-11-30 08:00:17 -05:00
TestScene.unity.meta	Updated room model and lighting	2023-11-03 14:14:26 -04:00