Sam 
							
						 
					 
					
						
						
							
						
						2dd782e72f 
					 
					
						
						
							
							actually fixed UI  
						
						 
						
						
						
						
					 
					
						2023-05-04 14:17:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						ef2fe7c97f 
					 
					
						
						
							
							fix: Made audio work again  
						
						 
						
						
						
						
					 
					
						2023-05-04 14:08:21 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						96acb9ba5f 
					 
					
						
						
							
							boing  
						
						 
						
						
						
						
					 
					
						2023-05-04 13:53:37 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						7070b33ad3 
					 
					
						
						
							
							fixed UI  
						
						 
						
						
						
						
					 
					
						2023-05-04 13:32:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						17c35b411e 
					 
					
						
						
							
							boing boing mf  
						
						 
						
						
						
						
					 
					
						2023-05-04 13:31:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						a6caababa3 
					 
					
						
						
							
							working on Bounce  
						
						 
						
						
						
						
					 
					
						2023-05-04 13:20:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						1c7ced7b71 
					 
					
						
						
							
							change: Removed reference to old state controller  
						
						 
						
						
						
						
					 
					
						2023-05-04 11:48:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						4c7ab5fc8c 
					 
					
						
						
							
							fix: Changed one last invocation to the new state controller system  
						
						 
						
						
						
						
					 
					
						2023-05-04 11:47:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						212695df5d 
					 
					
						
						
							
							change: Removed dependencies and references to OLD_StateController  
						
						 
						
						
						
						
					 
					
						2023-05-04 11:26:47 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						ee158dd9a1 
					 
					
						
						
							
							change: Added new tilemaps and MushroomForest scene  
						
						 
						
						... 
						
						
						
						This adds two new tilesets, as well as start on the mushroom forest
scene that includes part of the block out of the level, but nothing else 
						
						
					 
					
						2023-05-04 11:26:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						ee0b076ba7 
					 
					
						
						
							
							Added in tilemaps and started blocking the level out  
						
						 
						
						
						
						
					 
					
						2023-05-04 11:26:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						5a7ce8fb2b 
					 
					
						
						
							
							change: Switched the state controller and scene controller to a singleton class  
						
						 
						
						... 
						
						
						
						This doesnt' change any of the logic, but simplifies a lot of the main
game loop code.
Many things still rely on the singleton class, but shouldn't so this
will be fixed in a later commit 
						
						
					 
					
						2023-05-04 11:25:58 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						afbcb920ac 
					 
					
						
						
							
							brasslands  
						
						 
						
						
						
						
					 
					
						2023-05-03 17:55:54 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						3108c31489 
					 
					
						
						
							
							added trumpet visual  
						
						 
						
						
						
						
					 
					
						2023-05-03 13:16:44 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						8d230a5a71 
					 
					
						
						
							
							new dash  
						
						 
						
						
						
						
					 
					
						2023-05-03 12:06:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						f7d45185fa 
					 
					
						
						
							
							dash is working better!  
						
						 
						
						
						
						
					 
					
						2023-05-03 11:53:37 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						6fda5e48b5 
					 
					
						
						
							
							a few small things  
						
						 
						
						... 
						
						
						
						changed camera in brasslands and cave, made pin animation shorter 
						
						
					 
					
						2023-05-03 10:42:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						ba8b17f4ed 
					 
					
						
						
							
							cloud color  
						
						 
						
						
						
						
					 
					
						2023-05-03 10:18:54 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						a833bdf0a1 
					 
					
						
						
							
							clarinet check  
						
						 
						
						
						
						
					 
					
						2023-05-03 10:11:00 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						7ab17418bb 
					 
					
						
						
							
							trying dash things  
						
						 
						
						
						
						
					 
					
						2023-05-03 10:09:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						fba3f60354 
					 
					
						
						
							
							hi  
						
						 
						
						
						
						
					 
					
						2023-05-03 10:03:43 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						6a910bd0d6 
					 
					
						
						
							
							Merge branch 'master' of  https://gitlab.nicholasnovak.io/fums/ofb  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:54:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						e0308905a3 
					 
					
						
						
							
							more  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:53:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						76180cdcb4 
					 
					
						
						
							
							brassland fix  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:53:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						f1844faea3 
					 
					
						
						
							
							Merge branch 'master' of  https://gitlab.nicholasnovak.io/fums/ofb  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:47:14 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						8d0e65e080 
					 
					
						
						
							
							scene addons  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:45:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						e134dc039e 
					 
					
						
						
							
							Merge branch 'master' of  https://gitlab.nicholasnovak.io/fums/ofb  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:37:30 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						90e2f1ae26 
					 
					
						
						
							
							more from me  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:37:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						598e8c1dba 
					 
					
						
						
							
							more scene additions  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:16:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						21a69ca2bb 
					 
					
						
						
							
							updates to my scenes  
						
						 
						
						
						
						
					 
					
						2023-05-03 08:45:30 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						f1e2de295f 
					 
					
						
						
							
							ugh2  
						
						 
						
						
						
						
					 
					
						2023-05-03 08:15:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						3aa0823bbe 
					 
					
						
						
							
							ugh  
						
						 
						
						
						
						
					 
					
						2023-05-03 00:35:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						ed72a093fb 
					 
					
						
						
							
							hello again  
						
						 
						
						
						
						
					 
					
						2023-05-02 23:32:12 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						36e5300300 
					 
					
						
						
							
							periodic update for my own sanity  
						
						 
						
						
						
						
					 
					
						2023-05-02 22:04:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						0b1e41fb61 
					 
					
						
						
							
							added one line to fix a unity thing  
						
						 
						
						
						
						
					 
					
						2023-05-02 18:21:00 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						21dd2d889a 
					 
					
						
						
							
							nothing much starting to set up my scripts  
						
						 
						
						
						
						
					 
					
						2023-05-02 17:00:58 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						163ead5f93 
					 
					
						
						
							
							added transition images system  
						
						 
						
						
						
						
					 
					
						2023-05-02 16:41:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						0cc0f292f1 
					 
					
						
						
							
							added transition scene between tambourine and clarinet  
						
						 
						
						
						
						
					 
					
						2023-05-02 16:10:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						493258f1f9 
					 
					
						
						
							
							combined ch and gv scene, created bl scene  
						
						 
						
						
						
						
					 
					
						2023-05-01 18:58:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						fc8c2e6062 
					 
					
						
						
							
							ACTUALLY FIXED BROKEN COMMIT  
						
						 
						
						... 
						
						
						
						pull this one! 
						
						
					 
					
						2023-05-01 17:30:54 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						071a9b43d4 
					 
					
						
						
							
							FIXED BROKEN COMMIT  
						
						 
						
						... 
						
						
						
						for whatever reason the player animator was not being accessed, this should fix it 
						
						
					 
					
						2023-05-01 16:59:51 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						347b1a0b2c 
					 
					
						
						
							
							fixed: tambourine ui resets properly on player death  
						
						 
						
						
						
						
					 
					
						2023-05-01 16:53:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						cc694586a4 
					 
					
						
						
							
							fixed ui  
						
						 
						
						... 
						
						
						
						also added the general game ui canvas to all scenes 
						
						
					 
					
						2023-05-01 16:36:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						febbf21253 
					 
					
						
						
							
							added some basic ui  
						
						 
						
						... 
						
						
						
						still work in progress, just a progress commit! 
						
						
					 
					
						2023-05-01 16:05:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						d1528cc6ff 
					 
					
						
						
							
							fixed footsteps  
						
						 
						
						... 
						
						
						
						also @bryanna i moved the grapple poles in the village so they can be reached without the trumpet jump 
						
						
					 
					
						2023-05-01 15:06:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						d2d10f064b 
					 
					
						
						
							
							added footsteps!  
						
						 
						
						... 
						
						
						
						need to move the call from OnMove to Run, still some bugfixing to do 
						
						
					 
					
						2023-05-01 14:22:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						58222ed569 
					 
					
						
						
							
							changed death animation, moved enemies  
						
						 
						
						
						
						
					 
					
						2023-05-01 13:35:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						61939d5090 
					 
					
						
						
							
							fixed double jump  
						
						 
						
						... 
						
						
						
						the player can no longer jump twice in the air if they walk off a ledge 
						
						
					 
					
						2023-05-01 02:12:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						932af31dc9 
					 
					
						
						
							
							player can only access items in correct scenes  
						
						 
						
						
						
						
					 
					
						2023-05-01 01:52:42 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						d3893d3f0e 
					 
					
						
						
							
							improved tambourine behavior  
						
						 
						
						... 
						
						
						
						also worked a bit on level balancing, adding background details 
						
						
					 
					
						2023-05-01 01:15:21 -07:00