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
..
Animations	Merge pull request 'FIlament Step' (#12) from feature/Filament-Step into integration/VR-Updates	2023-11-07 20:37:20 +00:00
Architecture textures pack	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
AssetStoreOriginals	Stratasys MC450 VR v1.0	2023-11-08 00:49:01 -05:00
Environment	Merge branch 'bugfix/merge02' into bugfix/Fit-It-All-Walkup	2024-02-01 12:11:08 -05:00
Lighting	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Materials	Merge branch 'feature/unity-xr-hands' into feature/MAVRIC-2174_Update_Info_Board	2023-11-06 22:30:16 -05:00
Models	Gravity fix	2024-01-11 10:29:50 -05:00
Oculus	Meta quest hands free	2023-12-13 11:47:31 -05:00
Plugins	Added meta quest movement	2023-11-29 08:49:07 -05:00
Prefabs	Merge branch 'bugfix/merge03' into bugfix/Fit-It-All-Walkup	2024-02-01 12:31:08 -05:00
Resources	Added build folder	2023-12-14 09:58:40 -05:00
Samples	Updated height and overrides	2024-01-25 15:24:17 -05:00
Scenes	Merge branch 'bugfix/merge03' into bugfix/Fit-It-All-Walkup	2024-02-01 12:31:08 -05:00
Scripts	Gravity fix	2024-01-11 10:29:50 -05:00
Settings	Merge branch 'development' into feature/2177-Update-Lighting	2024-01-24 11:52:18 -05:00
TextMesh Pro	Watch in position	2024-01-09 13:22:13 -05:00
Textures	Fixed watch texture	2024-01-09 15:38:27 -05:00
UI	MAVRIC-2174 save point	2023-11-03 16:03:13 -04:00
Video	Merge remote-tracking branch 'origin/feature/MAVRIC-2174_Update_Info_Board' into feature/Filament-Step	2023-11-07 11:31:05 -05:00
VRTemplateAssets	MAVRIC-2175: Added the Final step and wired it into the guide canister animation controller	2023-11-07 19:49:15 -05:00
XR	Update to 3.17 Unity version	2024-01-18 14:33:32 -05:00
XRI	Added build folder	2023-12-14 09:58:40 -05:00
XRI_Examples	Updates to the XR Rig to get locomotion working	2023-11-06 13:27:47 -05:00
Animations.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Architecture textures pack.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
AssetStoreOriginals.meta	Stratasys MC450 VR v1.0	2023-11-08 00:49:01 -05:00
Environment.meta	First pass at updated room design	2023-11-07 18:37:30 -05:00
Lighting.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Materials.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Models.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Oculus.meta	Meta quest hands free	2023-12-13 11:47:31 -05:00
Plugins.meta	MAVRIC-2183: Update to Odin Inspector	2023-11-10 15:15:01 -05:00
Prefabs.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Resources.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Samples.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Scenes.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Scripts.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Settings.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
TextMesh Pro.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
Textures.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
UI.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
Video.meta	added model and prefabs	2023-11-01 10:51:29 -04:00
VRTemplateAssets.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
XR.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00
XRI_Examples.meta	Added XRI Examples scene for testing hands implementation	2023-11-06 11:42:08 -05:00
XRI.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00