39 Commits

Author	SHA1	Message	Date
Kip Taylor	eaa28b9b1d	POST IT	2024-04-25 12:37:57 -04:00
Noah	d9539cf44a	Merge branch 'development' into feature/ButtonHittingBall	2024-04-25 09:00:28 -04:00
Noah	f17164d52c	updates stuff	2024-04-25 08:43:17 -04:00
cbrown	48b7960bc5	Added Listener to disable floor collider when ball gets in hole	2024-04-24 15:53:30 -04:00
Noah	d6bbeb30e0	Merge branch 'development' into feature/ButtonHittingBall	2024-04-24 15:37:27 -04:00
Noah	b1b4414346	Updates in room	2024-04-24 15:35:45 -04:00
Ktaylor	49422cfeb7	Made it realll good	2024-04-24 14:44:33 -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
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
Abraham Blain	8eb341167c	Placing more portraits	2024-04-23 14:15:40 -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
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
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
Abraham Blain	482d1b17e3	added spear trap to main room	2024-04-23 11:55:44 -04:00
Abraham Blain	9c34971064	Updated from dev	2024-04-23 11:47:32 -04:00
Noah	52f19289f1	Good To Go	2024-04-23 11:14:59 -04:00
Joshua Latham	2cdd2896af	Fixed hole and ball issues. Created gameplay prefabs.	2024-04-22 12:15:01 -04:00
Joshua Latham	9e0faf5386	Updated prefabs to have colliders respond to Hole events.	2024-04-22 11:12:26 -04:00
Joshua Latham	5f98e8c62d	Main room should be fully playable now.	2024-04-18 10:47:50 -04:00
Joshua Latham	83f04a655b	Fixed orientation or AR content prefabs. Continuing to add colliders to Main room.	2024-04-18 10:26:27 -04:00
Joshua Latham	13a7b9ece5	Added more colliders to Main Room. Cleaned up other prefabs.	2024-04-18 09:19:43 -04:00
Joshua Latham	961d177a2e	Added colliders to Control and Green rooms. Main still WIP.	2024-04-18 00:59:55 -04:00
Joshua Latham	974e293bb3	Added more props from the Horror pack	2024-04-17 16:14:47 -04:00
Joshua Latham	bcbbf97dd1	Added AR Content prefabs for first two holes. Still WIP	2024-04-17 13:23:41 -04:00
Joshua Latham	ced869f4bc	Main room first draft	2024-04-16 23:31:30 -04:00
Joshua Latham	be12f171f8	Control room course first draft.	2024-04-16 18:10:27 -04:00
Joshua Latham	6102279e90	Added Dungeon content and reference scans	2024-04-16 13:20:50 -04:00