| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							27e512a780
							
						
					 | 
					
						
						
							
							delete unused script
						
						
						
						
						
						
					 | 
					
						2021-03-05 12:49:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							98a9003556
							
						
					 | 
					
						
						
							
							Merge branch 'main' into Traps
						
						
						
						
						
						
					 | 
					
						2021-03-05 12:06:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a2003fa4a0
							
						
					 | 
					
						
						
							
							Merge branch 'main' into Anims_Idle+Walk
						
						
						
						
						
						
					 | 
					
						2021-03-05 11:32:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LojZa33
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0a80e3103
							
						
					 | 
					
						
						
							
							Animations Idle Walk(to be fixed)
						
						
						
						
						
						
					 | 
					
						2021-03-04 23:11:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							427ca62821
							
						
					 | 
					
						
						
							
							place artefacts and add dialogue triggers
						
						
						
						
						
						
					 | 
					
						2021-03-04 18:53:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fe1e69fa94
							
						
					 | 
					
						
						
							
							add safe and kill planes
						
						
						
						
						
						
					 | 
					
						2021-03-04 16:55:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8b2e1e977
							
						
					 | 
					
						
						
							
							added events & banks for new audio
						
						
						
						
						
						
					 | 
					
						2021-03-04 15:40:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							363ae1cb58
							
						
					 | 
					
						
						
							
							added cai's WIP music track
						
						
						
						
						
						
					 | 
					
						2021-03-04 15:05:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							695440e978
							
						
					 | 
					
						
						
							
							added cai's audio stuff
						
						
						
						
						
						
					 | 
					
						2021-03-04 14:52:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CharlieTinley
							
						 
					 | 
					
						
						
						
						
							
						
						
							45ec2145ef
							
						
					 | 
					
						
						
							
							minor bug fixes
						
						
						
						
						
						
					 | 
					
						2021-03-03 21:36:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e772598beb
							
						
					 | 
					
						
						
							
							add level geometry to main scene
						
						
						
						
						
						
					 | 
					
						2021-03-03 20:29:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							faf6c30b3e
							
						
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2021-03-03 16:45:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0290806bbc
							
						
					 | 
					
						
						
							
							use SO-based references for respawn position and events
						
						
						
						
						
						
					 | 
					
						2021-03-03 12:53:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							84c67b7f11
							
						
					 | 
					
						
						
							
							Merge branch 'Feature/TrimSheet' into 'main'
						
						
						
						
						
						
						
						ALPHA LEVEL
See merge request kernel-panic/revival!24 
						
						
					 | 
					
						2021-03-02 21:07:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Programmer-DField
							
						 
					 | 
					
						
						
						
						
							
						
						
							be850a3795
							
						
					 | 
					
						
						
							
							Changes made as per code review.
						
						
						
						
						
						
					 | 
					
						2021-03-02 19:47:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CharlieTinley
							
						 
					 | 
					
						
						
						
						
							
						
						
							88fd38453b
							
						
					 | 
					
						
						
							
							Created the ALPHA level with collisions on geometry
						
						
						
						
						
						
					 | 
					
						2021-03-02 19:33:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ad40b0195e
							
						
					 | 
					
						
						
							
							made main use new cameras
						
						
						
						
						
						
					 | 
					
						2021-03-02 19:06:17 +00:00 | 
					
					
						
						
							
							
							
						
					 |