| 
						
					 | 
					
						
						
						
						
							
						
						
							8e62127c71
							
						
					 | 
					
						
						
							
							added new whooshes
						
						
						
						
						
						
					 | 
					
						2021-03-12 00:18:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e1b5fc214a
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/dialogue-inject-prompts
						
						
						
						
						
						
					 | 
					
						2021-03-11 20:44:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d5c493bcd
							
						
					 | 
					
						
						
							
							inject input prompt sprites into dialogue
						
						
						
						
						
						
					 | 
					
						2021-03-11 20:25:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bdd9fc2e39
							
						
					 | 
					
						
						
							
							buttons
						
						
						
						
						
						
					 | 
					
						2021-03-11 20:23:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ecd6bab441
							
						
					 | 
					
						
						
							
							juiced artefact unlock screen
						
						
						
						
						
						
					 | 
					
						2021-03-11 19:34:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6538706e4a
							
						
					 | 
					
						
						
							
							bad rider >:l
						
						
						
						
						
						
					 | 
					
						2021-03-11 16:01:21 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							599ff42a13
							
						
					 | 
					
						
						
							
							fixed main menu
						
						
						
						
						
						
					 | 
					
						2021-03-11 15:51:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							720d3cc325
							
						
					 | 
					
						
						
							
							artefact preview
						
						
						
						
						
						
					 | 
					
						2021-03-11 15:50:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4883623740
							
						
					 | 
					
						
						
							
							made artefact preview work
						
						
						
						
						
						
					 | 
					
						2021-03-11 13:31:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43f5a68d45
							
						
					 | 
					
						
						
							
							artefact ui overhaul
						
						
						
						
						
						
					 | 
					
						2021-03-11 13:12:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a76d00efa9
							
						
					 | 
					
						
						
							
							fixed scaling issues
						
						
						
						
						
						
					 | 
					
						2021-03-11 12:15:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a28207bbcd
							
						
					 | 
					
						
						
							
							added fade boi
						
						
						
						
						
						
					 | 
					
						2021-03-11 12:02:34 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c4a16ec55
							
						
					 | 
					
						
						
							
							dialogue juice
						
						
						
						
						
						
					 | 
					
						2021-03-11 11:48:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d5de30107f
							
						
					 | 
					
						
						
							
							reset falling floor trap position on player respawn
						
						
						
						
						
						
					 | 
					
						2021-03-10 18:26:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							762bbf6486
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2021-03-10 17:41:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30df2a4b71
							
						
					 | 
					
						
						
							
							branding™️
						
						
						
						
						
						
					 | 
					
						2021-03-08 17:34:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da08bdd574
							
						
					 | 
					
						
						
							
							oopsie
						
						
						
						
						
						
					 | 
					
						2021-03-08 17:19:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							faa05ad1a8
							
						
					 | 
					
						
						
							
							final pretties
						
						
						
						
						
						
					 | 
					
						2021-03-08 17:18:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							24be02e384
							
						
					 | 
					
						
						
							
							made stuff look good
						
						
						
						
						
						
					 | 
					
						2021-03-08 17:05:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aa9526268c
							
						
					 | 
					
						
						
							
							added graphics adjustment
						
						
						
						
						
						
					 | 
					
						2021-03-08 16:26:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d06cf5fb4
							
						
					 | 
					
						
						
							
							backend for playerpref audio
						
						
						
						
						
						
					 | 
					
						2021-03-08 15:13:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							50685f7d43
							
						
					 | 
					
						
						
							
							merged main properly
						
						
						
						
						
						
					 | 
					
						2021-03-05 19:33:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c86d67031d
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/audio-integration
						
						
						
						
						
						
					 | 
					
						2021-03-05 19:23:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							563f1f0cbf
							
						
					 | 
					
						
						
							
							boot flow stuff
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:40:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34352d95ab
							
						
					 | 
					
						
						
							
							added audio stuffs
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:22:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dd98fd5c40
							
						
					 | 
					
						
						
							
							speed up walk anim
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:08:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e8f8c313f
							
						
					 | 
					
						
						
							
							update player in main scene
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:06:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4d971c8170
							
						
					 | 
					
						
						
							
							Merge branch 'main' into Animation_IdletoWalkLocoMotion
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:01:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							143b3c2a7e
							
						
					 | 
					
						
						
							
							update player prefab
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:00:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dba218cc7e
							
						
					 | 
					
						
						
							
							delete script
						
						
						
						
						
						
					 | 
					
						2021-03-05 17:50:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LojZa33
							
						 
					 | 
					
						
						
						
						
							
						
						
							e81cab42e0
							
						
					 | 
					
						
						
							
							no message
						
						
						
						
						
						
					 | 
					
						2021-03-05 18:44:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ca7a5b91b
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/audio-integration
						
						
						
						
						
						
					 | 
					
						2021-03-05 17:19:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							de3cfe7449
							
						
					 | 
					
						
						
							
							tweaked VO settings
						
						
						
						
						
						
					 | 
					
						2021-03-05 17:17:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec8648b67c
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/falling-floor-trap-integration
						
						
						
						
						
						
					 | 
					
						2021-03-05 16:36:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43a01934bc
							
						
					 | 
					
						
						
							
							update trap prefab
						
						
						
						
						
						
					 | 
					
						2021-03-05 16:32:21 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e016e2b122
							
						
					 | 
					
						
						
							
							clean up trap floor prefab
						
						
						
						
						
						
					 | 
					
						2021-03-05 16:24:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							154d809540
							
						
					 | 
					
						
						
							
							Merge branch 'feature/audio-integration' into 'main'
						
						
						
						
						
						
						
						Feature/audio integration
Closes #56
See merge request kernel-panic/revival!32 
						
						
					 | 
					
						2021-03-05 15:48:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							687762b59e
							
						
					 | 
					
						
						
							
							Merge branch 'feature/menus' into 'main'
						
						
						
						
						
						
						
						Feature/menus
See merge request kernel-panic/revival!31 
						
						
					 | 
					
						2021-03-05 15:45:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							afdf5ce87b
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/audio-integration
						
						
						
						
						
						
					 | 
					
						2021-03-05 15:39:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f5262cda2c
							
						
					 | 
					
						
						
							
							implement vo lines via programmer instrument lol
						
						
						
						
						
						
					 | 
					
						2021-03-05 15:34:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a5b2f863fe
							
						
					 | 
					
						
						
							
							finalised main menu
						
						
						
						
						
						
					 | 
					
						2021-03-05 15:29:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							69e68e4879
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/menus
						
						
						
						
						
						
					 | 
					
						2021-03-05 14:16:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							87e5249578
							
						
					 | 
					
						
						
							
							tried to fix FMOD dialogue issue
						
						
						
						
						
						
					 | 
					
						2021-03-05 14:11:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a1a99d59b
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/audio-integration
						
						
						
						
						
						
					 | 
					
						2021-03-05 13:42:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							377a13fb4c
							
						
					 | 
					
						
						
							
							meta shenanigans
						
						
						
						
						
						
					 | 
					
						2021-03-05 13:42:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f20fe247a7
							
						
					 | 
					
						
						
							
							added VO FMOD events
						
						
						
						
						
						
					 | 
					
						2021-03-05 13:34:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6100035289
							
						
					 | 
					
						
						
							
							banks weren't tracked?
						
						
						
						
						
						
					 | 
					
						2021-03-05 13:26:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1aee232cb6
							
						
					 | 
					
						
						
							
							artefact registration, register event listeners after awake event
						
						
						
						
						
						
					 | 
					
						2021-03-05 13:26:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b164558076
							
						
					 | 
					
						
						
							
							added temporary VO lines
						
						
						
						
						
						
					 | 
					
						2021-03-05 13:02:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b64e4e30af
							
						
					 | 
					
						
						
							
							update fmod meta file apparently
						
						
						
						
						
						
					 | 
					
						2021-03-05 12:52:40 +00:00 | 
					
					
						
						
							
							
							
						
					 |