18 Commits

Author	SHA1	Message	Date
Brown, Caleb M	9795b0e526	Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step	2023-11-07 19:11:20 -05:00
Brown, Caleb M	c7abf5fb73	MAVRIC-2175: Updated origin position to be closer to the table	2023-11-07 14:23:44 -05:00
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
Calderon, Noah	ec8bbc9e52	Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board	2023-11-07 13:46:11 -05:00
Joshua Latham	e39ed3d013	Reorganized prefabs and test scenes.	2023-11-07 13:22:50 -05:00
Brown, Caleb M	441fb7aedc	MAVRIC-2175: Added a next step button to the scene because I can't get the socket logic working properly	2023-11-07 12:05:41 -05:00
Joshua Latham	d72630105f	Fixed teleportation. Hands are offset from the head now though.	2023-11-06 23:32:54 -05:00
Calderon, Noah	cea07721b6	Merge branch 'feature/unity-xr-hands' into feature/MAVRIC-2174_Update_Info_Board	2023-11-06 22:30:16 -05:00
Joshua Latham	190506bc46	Created MAVRIC XR Hands Origing rig prefab	2023-11-06 12:02:30 -05:00
Joshua Latham	cfd3ac4705	Re-imported hands samples. Updated standard materials to URP versions.	2023-11-06 10:29:26 -05:00
Joshua Latham	a99f7bccad	Added prefabe with hands for player	2023-11-06 10:22:50 -05:00
Joshua Latham	d7c13a014a	Updated lighting	2023-11-06 07:20:30 -05:00
Noah	b1fb92807f	MAVRIC-2174 save point	2023-11-05 22:05:29 -05:00
Joshua Latham	9e1b249f4a	Updated room model and lighting	2023-11-03 14:14:26 -04:00
Noah	4ac85495a2	MAVRIC-2110 fixed animation and added first step	2023-11-01 16:37:35 -04:00
Noah	33ae462d75	MAVRIC changing out spool	2023-11-01 12:19:10 -04:00
Noah	bab3773862	added model and prefabs	2023-11-01 10:51:29 -04:00
Joshua Latham	1dea5a0c4c	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00