141 Commits

Author	SHA1	Message	Date
cbrown	48b7960bc5	Added Listener to disable floor collider when ball gets in hole	2024-04-24 15:53:30 -04:00
cbrown	2ba3088658	Added QuickOutline asset	2024-04-24 15:52:11 -04:00
Ktaylor	49422cfeb7	Made it realll good	2024-04-24 14:44:33 -04:00
cbrown	757c214efe	Merge branch 'development' into feature/Sounds-Power	2024-04-24 12:52:35 -04:00
Abraham	88c7366379	Added sounds and increased hit power	2024-04-24 11:02:50 -04:00
Ktaylor	52e0c52421	Fixes	2024-04-24 10:38:22 -04:00
Ktaylor	8df3a21083	Colider work	2024-04-24 10:36:08 -04:00
Ktaylor	8ecd1e87b2	Move fix	2024-04-24 10:14:41 -04:00
Ktaylor	8e5ca9b248	Fixed positioning	2024-04-24 09:10:37 -04:00
Ktaylor	76e38e91f0	Final fixes	2024-04-24 08:49:06 -04:00
Kip Taylor	5f45fd639c	cool [anting	2024-04-23 15:03:11 -04:00
Kip Taylor	7741e80828	Merge branch 'development' into Obstical-Work ... # Conflicts: # Assets/CoursePrefabs/AR Content Control Room 1.prefab # Assets/CoursePrefabs/AR Content Green Room.prefab # Assets/CoursePrefabs/AR Content Main Room 1.prefab # Assets/Scenes/TAC Lab.unity	2024-04-23 14:34:07 -04:00
Kip Taylor	8c84bc53bd	Merge branch 'development' into Obstical-Work ... # Conflicts: # Assets/CoursePrefabs/AR Content Green Room.prefab # Assets/CoursePrefabs/AR Content Main Room 1.prefab	2024-04-23 14:28:32 -04:00
Abraham Blain	bc540ea9da	Placed even more portraits	2024-04-23 14:22:18 -04:00
Kip Taylor	86bf49d282	Merge branch 'development' into Obstical-Work	2024-04-23 14:19:51 -04:00
Kip Taylor	58f23250b9	Fire ob added	2024-04-23 14:19:33 -04:00
Abraham Blain	a3db22de46	Merge remote-tracking branch 'origin/development' into feature/Portraits	2024-04-23 14:16:37 -04:00
Abraham Blain	7723f53430	Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs	2024-04-23 14:16:03 -04:00
Abraham Blain	8eb341167c	Placing more portraits	2024-04-23 14:15:40 -04:00
Noah	df3c487807	Merge branch 'development' into feature/RoomAlignment	2024-04-23 14:07:55 -04:00
Kip Taylor	dd7cc6aa19	Merge branch 'development' into feature/Swinging-Axe-booogaloo	2024-04-23 13:59:47 -04:00
Kip Taylor	03729d6ccf	Merge branch 'development' into Obstical-Work	2024-04-23 13:56:11 -04:00
Abraham Blain	a48fc16087	Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs	2024-04-23 13:56:00 -04:00
Kip Taylor	a80f8936d9	Green room updating and main room	2024-04-23 13:56:00 -04:00
Abraham Blain	feff763e73	reverted ar main room rotation	2024-04-23 13:55:26 -04:00
Noah	1176df33bb	move spawn points	2024-04-23 13:54:23 -04:00
Abraham Blain	4ee16e6538	Auto stash before merge of "origin/development" and "feature/Portraits"	2024-04-23 13:53:53 -04:00
Abraham Blain	8fb1caf7ea	Merge remote-tracking branch 'origin/development' into feature/Portraits	2024-04-23 13:47:18 -04:00
Abraham Blain	2a84b8ae49	Added camera looking portraits	2024-04-23 13:47:11 -04:00
Noah	3b43d9b159	Merge branch 'development' into feature/RoomAlignment	2024-04-23 13:45:44 -04:00
cbrown	4280f9f7e9	Added fake occlusion material	2024-04-23 13:14:20 -04:00
Kip Taylor	a4050af022	Merge branch 'development' into Obstical-Work ... # Conflicts: # Assets/CoursePrefabs/AR Content Control Room 1.prefab	2024-04-23 13:00:38 -04:00
Kip Taylor	baf421843a	Moved objects	2024-04-23 12:59:56 -04:00
Kip Taylor	e55fba92ab	Fixing scripts and adding objects	2024-04-23 12:53:11 -04:00
cbrown	a237c2efb1	Added Ball Attraction force trigger to hole	2024-04-23 12:35:13 -04:00
Kip Taylor	887ce10607	Merge branch 'development' into Obstical-Work	2024-04-23 12:27:12 -04:00
Noah	fa8889bc0f	save point	2024-04-23 12:12:01 -04:00
Abraham Blain	482d1b17e3	added spear trap to main room	2024-04-23 11:55:44 -04:00
Abraham Blain	37ed1d1934	Merge branch 'development' into feature/Obstacles-On-Course	2024-04-23 11:48:10 -04:00
Abraham Blain	9c34971064	Updated from dev	2024-04-23 11:47:32 -04:00
Abraham Blain	90e040676f	Added bomb timeout	2024-04-23 11:45:53 -04:00
Noah	81310d0779	Merge branch 'development' into feature/LoadingCourseOnPlane	2024-04-23 11:15:29 -04:00
Noah	52f19289f1	Good To Go	2024-04-23 11:14:59 -04:00
Kip Taylor	6d2d1b116c	Fina laxe fixes	2024-04-23 11:12:08 -04:00
Kip Taylor	bc31e72110	Axe anime fix i Pray	2024-04-23 11:10:56 -04:00
Kip Taylor	f3719571ae	Removing tax lab add	2024-04-23 10:31:06 -04:00
Kip Taylor	5ddfdbb64f	Swinging axe	2024-04-23 10:28:52 -04:00
Noah	1e0552bc57	Merge branch 'development' into feature/LoadingCourseOnPlane	2024-04-23 08:51:54 -04:00
cbrown	3d4658f9a0	Merge branch 'development' into feature/Spear-Trap ... # Conflicts: # Assets/Scenes/TestControls.unity	2024-04-22 15:42:34 -04:00
cbrown	e6969d0805	HOTFIX: Removed half distance check on MoveFloor component	2024-04-22 15:32:35 -04:00