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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						e0308905a3 
					 
					
						
						
							
							more  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:53:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						90e2f1ae26 
					 
					
						
						
							
							more from me  
						
						 
						
						
						
						
					 
					
						2023-05-03 09:37:22 -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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						46f7cfe07e 
					 
					
						
						
							
							fixed: player jittering and death sliding  
						
						 
						
						
						
						
					 
					
						2023-04-30 23:53:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						14a4de41cc 
					 
					
						
						
							
							bugfixing  
						
						 
						
						... 
						
						
						
						added canvas objects to all scenes (and event systems with them), game should be playable all the way through maybe! 
						
						
					 
					
						2023-04-30 22:01:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						c51af3ce92 
					 
					
						
						
							
							bugfixed tambourine and player death  
						
						 
						
						... 
						
						
						
						death still needs work! 
						
						
					 
					
						2023-04-30 14:16:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						9f36564e67 
					 
					
						
						
							
							add player death animation  
						
						 
						
						... 
						
						
						
						also bugfixed some tambourine stuff 
						
						
					 
					
						2023-04-30 13:58:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						16a190949d 
					 
					
						
						
							
							created victory object and level progression  
						
						 
						
						... 
						
						
						
						also tried to create a way to launch the game from any scene, but it doesn't really work. don't use anything in the folder called "DEBUG" 
						
						
					 
					
						2023-04-30 13:34:02 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						df97e9c5c1 
					 
					
						
						
							
							add trumpet sound effect  
						
						 
						
						
						
						
					 
					
						2023-04-30 00:19:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						dd3d1386be 
					 
					
						
						
							
							edited some player data to make grapple and jump feel better  
						
						 
						
						
						
						
					 
					
						2023-04-29 18:22:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						3318e11fd1 
					 
					
						
						
							
							Added explosion on enemy defeat  
						
						 
						
						... 
						
						
						
						Also added a little force for when you land on an enemy, but sometimes it YEETS the player if done at the right moment with a trumpet jump 
						
						
					 
					
						2023-04-29 18:10:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						405e20ca2f 
					 
					
						
						
							
							lots of small changes lol  
						
						 
						
						... 
						
						
						
						worked on tambourine level layout, improved tambourine throwing, created enemy respawn system 
						
						
					 
					
						2023-04-29 14:51:50 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						ed3fcf541c 
					 
					
						
						
							
							changed some tambourine behavior  
						
						 
						
						... 
						
						
						
						also working on level layout 
						
						
					 
					
						2023-04-28 22:07:28 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						ac035cecf9 
					 
					
						
						
							
							made some changes to double jump  
						
						 
						
						
						
						
					 
					
						2023-04-28 16:18:50 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								allylikesfrogs 
							
						 
					 
					
						
						
							
						
						db0e7665f7 
					 
					
						
						
							
							more layout stuff, still haven't written the script for clarinet or water though :(  
						
						 
						
						
						
						
					 
					
						2023-04-28 11:49:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						4625a1f6ba 
					 
					
						
						
							
							added new enemy prefab, reconfigured enemy patrol script  
						
						 
						
						... 
						
						
						
						enemy patrol now contains option for vertical movement 
						
						
					 
					
						2023-04-28 02:13:40 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						06f8cefd11 
					 
					
						
						
							
							committing the player data numbers changes  
						
						 
						
						... 
						
						
						
						unity is being stupid, turns out changing this data AT ALL will *not* update the file to be tracked in git. instead, need to quit unity and reopen it to get git to recognize the changes, like here 
						
						
					 
					
						2023-04-28 01:43:14 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						153a1b4f8d 
					 
					
						
						
							
							fixed combining branch  
						
						 
						
						
						
						
					 
					
						2023-04-27 20:12:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						716036bc1f 
					 
					
						
						
							
							moved trumpet jump to new player controller  
						
						 
						
						... 
						
						
						
						this should work, though i'm still not 100% sure how the new jump works 
						
						
					 
					
						2023-04-27 19:47:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam 
							
						 
					 
					
						
						
							
						
						01ebd18f5b 
					 
					
						
						
							
							merged "master" into "combining  
						
						 
						
						
						
						
					 
					
						2023-04-27 19:15:53 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bryanna 
							
						 
					 
					
						
						
							
						
						79194a1015 
					 
					
						
						
							
							grenouille assets  
						
						 
						
						
						
						
					 
					
						2023-04-27 15:56:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								slevy14 
							
						 
					 
					
						
						
							
						
						863d7e04ef 
					 
					
						
						
							
							(kinda) fixed grapple momentum  
						
						 
						
						... 
						
						
						
						also updated the player prefab -- PLEASE remember to override the player prefab with any changes you make to the individual object in the scene 
						
						
					 
					
						2023-04-27 13:31:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Novak 
							
						 
					 
					
						
						
							
						
						8e221cf94b 
					 
					
						
						
							
							Adapted movement controller to work with master  
						
						 
						
						
						
						
					 
					
						2023-04-27 12:54:31 -07:00