Sam
							
						 
					 | 
					
						
						
							
						
						873f9216ce
					 | 
					
						
						
							
							Merge branch 'FinalSubmission'
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:30:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						3a2368d8b7
					 | 
					
						
						
							
							put tambourine back on player prefab
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:30:33 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						76fe0be86d
					 | 
					
						
						
							
							Merge branch 'master' into FinalSubmission
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:27:39 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						5333e6028d
					 | 
					
						
						
							
							fix: Re-added projectiles deleting themselves when they hit the player
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:09:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						f5beaf0fe9
					 | 
					
						
						
							
							change: Fixed some of the colliders on geometry, and removed an old grapple point
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:09:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						4135171a79
					 | 
					
						
						
							
							change: Reduced cymbal range to make it harder
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:09:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						bf6996b029
					 | 
					
						
						
							
							expanded borders of clarinet tilemap
						
						
						
						
						
						
					 | 
					
						2023-05-07 00:00:21 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						c2b9a2aa88
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2023-05-06 23:59:14 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						fc4a9a74d7
					 | 
					
						
						
							
							minor changes to gv and bl
						
						
						
						
						
						
					 | 
					
						2023-05-06 23:57:50 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						56c9c0e1bb
					 | 
					
						
						
							
							improved tambourine collider
						
						
						
						
						
						
						
						just expanded it slightly so it doesn't get stuck on the bats' heads anymore 
						
						
					 | 
					
						2023-05-06 23:53:25 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						3831813409
					 | 
					
						
						
							
							musica
						
						
						
						
						
						
					 | 
					
						2023-05-06 23:18:56 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						02a3a5bf5c
					 | 
					
						
						
							
							change: Added music for MushroomForest
						
						
						
						
						
						
					 | 
					
						2023-05-06 23:12:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						b779d63e3a
					 | 
					
						
						
							
							change: Finished my level for the last time, and added all my mechanics in
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:14:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						8daa9cbfd6
					 | 
					
						
						
							
							change: Implemented the cymbals as a pogo mechanic for projectiles
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:14:04 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						e79f43de22
					 | 
					
						
						
							
							change: Edited the cymbal sound to be shorter
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:10:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						2567cb867d
					 | 
					
						
						
							
							change: Changed some more of the tilemaps and added a background
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:10:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						7f7dd1292f
					 | 
					
						
						
							
							change: Added functionality for projectile enemies to shoot
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:10:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						16cf4b066d
					 | 
					
						
						
							
							change: Added spore shooter enemy
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:10:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicholas Novak
							
						 
					 | 
					
						
						
							
						
						f4c66d6286
					 | 
					
						
						
							
							change: Added sprites for spore enemies
						
						
						
						
						
						
					 | 
					
						2023-05-06 22:10:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						d6f204806d
					 | 
					
						
						
							
							testing why enemies jittering
						
						
						
						
						
						
					 | 
					
						2023-05-06 21:00:15 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						7d6eaae833
					 | 
					
						
						
							
							change to bl ending
						
						
						
						
						
						
					 | 
					
						2023-05-06 19:51:35 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						95a2a8b5eb
					 | 
					
						
						
							
							fixed collider!
						
						
						
						
						
						
					 | 
					
						2023-05-06 19:50:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						4146ea97dd
					 | 
					
						
						
							
							fixed sounds and level blocking (again)
						
						
						
						
						
						
					 | 
					
						2023-05-06 19:45:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						a13c836373
					 | 
					
						
						
							
							fixed transition scene merge error
						
						
						
						
						
						
					 | 
					
						2023-05-06 19:26:35 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						e723e2b612
					 | 
					
						
						
							
							???
						
						
						
						
						
						
					 | 
					
						2023-05-06 19:20:37 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						de5abe740b
					 | 
					
						
						
							
							fixed transition scenes (also deleted the sample scene)
						
						
						
						
						
						
					 | 
					
						2023-05-06 19:13:20 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						b6804e2986
					 | 
					
						
						
							
							removed commented out code and print statements
						
						
						
						
						
						
						
						the console should finally be message free! except for the unity memory leak lol but that one's not on us 
						
						
					 | 
					
						2023-05-06 19:05:46 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						c13793565d
					 | 
					
						
						
							
							fixed dialog box array resizing errors
						
						
						
						
						
						
					 | 
					
						2023-05-06 18:49:45 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						05cf1c729b
					 | 
					
						
						
							
							fixed explosion animation
						
						
						
						
						
						
						
						should've been in previous commit but it didn't save bc unity being unity 
						
						
					 | 
					
						2023-05-06 18:32:19 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						9b3bc81173
					 | 
					
						
						
							
							fixed: player no longer holds grapple after dying to projectile
						
						
						
						
						
						
					 | 
					
						2023-05-06 18:25:35 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						dcfae28ee3
					 | 
					
						
						
							
							fixed enemies not dying if pinned
						
						
						
						
						
						
					 | 
					
						2023-05-06 18:12:32 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						3ad6568707
					 | 
					
						
						
							
							more balance to caverns
						
						
						
						
						
						
					 | 
					
						2023-05-06 17:37:35 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						3e2f462b3d
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
						
						
						
						
						
						
					 | 
					
						2023-05-06 17:27:12 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						6292632853
					 | 
					
						
						
							
							wrapping up
						
						
						
						
						
						
					 | 
					
						2023-05-06 17:27:02 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						5c75acab96
					 | 
					
						
						
							
							added more spawn points, fixed pin animation
						
						
						
						
						
						
					 | 
					
						2023-05-06 17:26:56 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam
							
						 
					 | 
					
						
						
							
						
						a757a47af1
					 | 
					
						
						
							
							fixed tambourine
						
						
						
						
						
						
						
						such a stupid issue omg i can't believe it took me this long to realize what was happening. also added transition music into the caverns 
						
						
					 | 
					
						2023-05-06 17:16:35 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						726ef3d1be
					 | 
					
						
						
							
							what if for the poster i gave claude an infinity gauntlet and replaced the gems with his instruments
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:58:34 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						c61a38ee9d
					 | 
					
						
						
							
							sounds!
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:47:57 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						05d7a72699
					 | 
					
						
						
							
							i have charged my laptop
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:11:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						5a20ebb5a9
					 | 
					
						
						
							
							i keep pushing but the baby doesn't want to come out (music)
						
						
						
						
						
						
					 | 
					
						2023-05-06 15:45:32 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						c8060e33d6
					 | 
					
						
						
							
							please look at my levels
						
						
						
						
						
						
					 | 
					
						2023-05-06 15:22:08 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						643b6c6b41
					 | 
					
						
						
							
							paintings
						
						
						
						
						
						
					 | 
					
						2023-05-06 15:07:57 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						954e11b299
					 | 
					
						
						
							
							more gren and bl changes
						
						
						
						
						
						
					 | 
					
						2023-05-06 14:51:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						491fda25c7
					 | 
					
						
						
							
							changing dash params
						
						
						
						
						
						
					 | 
					
						2023-05-06 14:46:20 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						3d93b3840b
					 | 
					
						
						
							
							more gren
						
						
						
						
						
						
					 | 
					
						2023-05-06 14:29:28 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						2ce95c9976
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
						
						
						
						
						
						
					 | 
					
						2023-05-06 14:23:32 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						ba56be61d3
					 | 
					
						
						
							
							reorganizing enemies
						
						
						
						
						
						
					 | 
					
						2023-05-06 14:23:24 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						49a9224fce
					 | 
					
						
						
							
							gren fixes
						
						
						
						
						
						
					 | 
					
						2023-05-06 14:09:13 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bryanna
							
						 
					 | 
					
						
						
							
						
						d21841b88b
					 | 
					
						
						
							
							transition screen backgrounds
						
						
						
						
						
						
					 | 
					
						2023-05-06 13:51:22 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								allylikesfrogs
							
						 
					 | 
					
						
						
							
						
						09758c732c
					 | 
					
						
						
							
							blocking in some more tile stuff!
						
						
						
						
						
						
					 | 
					
						2023-05-06 12:25:29 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |