| 
						
					 | 
					
						
						
						
						
							
						
						
							0290806bbc
							
						
					 | 
					
						
						
							
							use SO-based references for respawn position and events
						
						
						
						
						
						
					 | 
					
						2021-03-03 12:53:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e8710a926
							
						
					 | 
					
						
						
							
							Merge branch 'main' into CineCamera
						
						
						
						
						
						
					 | 
					
						2021-03-02 19:05:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7551e3434e
							
						
					 | 
					
						
						
							
							added player glue prefab
						
						
						
						
						
						
					 | 
					
						2021-03-02 19:04:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f90267dedf
							
						
					 | 
					
						
						
							
							added cameras into seperate prefab
						
						
						
						
						
						
					 | 
					
						2021-03-02 18:59:04 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef203777ae
							
						
					 | 
					
						
						
							
							Merge branch 'main' into CineCamera
						
						
						
						
						
						
					 | 
					
						2021-03-02 18:44:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							83b313dc8d
							
						
					 | 
					
						
						
							
							Merge branch 'feature/scripted-dialogue-triggers' into 'main'
						
						
						
						
						
						
						
						add prefab for scripted dialogue trigger zone
See merge request kernel-panic/revival!20 
						
						
					 | 
					
						2021-03-02 18:37:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d8eff8015
							
						
					 | 
					
						
						
							
							fixed camera rotation issues'
						
						
						
						
						
						
					 | 
					
						2021-03-02 18:28:13 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0281749075
							
						
					 | 
					
						
						
							
							Merge branch 'main' into artefactUI
						
						
						
						
						
						
					 | 
					
						2021-03-02 18:20:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cc28ee3c2f
							
						
					 | 
					
						
						
							
							add prefab for scripted dialogue trigger zone
						
						
						
						
						
						
					 | 
					
						2021-03-02 13:24:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Programmer-DField
							
						 
					 | 
					
						
						
						
						
							
						
						
							169c2a4477
							
						
					 | 
					
						
						
							
							Now have a work around for the camera.
						
						
						
						
						
						
					 | 
					
						2021-03-01 18:03:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							14a4d3c1b8
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/artefact-dialogue
						
						
						
						
						
						
					 | 
					
						2021-03-01 16:18:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8d79c2b10
							
						
					 | 
					
						
						
							
							Changes in Artefact inheritance
						
						
						
						
						
						
					 | 
					
						2021-02-25 20:12:08 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e06b98577
							
						
					 | 
					
						
						
							
							Added Artefact inheritance
						
						
						
						
						
						
						
						PowerArtefacts now can unlock PlayerPowers 
						
						
					 | 
					
						2021-02-25 14:21:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e47f04fb79
							
						
					 | 
					
						
						
							
							trigger dialogue on artefact pickup
						
						
						
						
						
						
					 | 
					
						2021-02-23 13:05:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c66bf6f1f1
							
						
					 | 
					
						
						
							
							replicate main scene setup in dialogue dev scene
						
						
						
						
						
						
					 | 
					
						2021-02-23 09:58:49 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a96a44a64
							
						
					 | 
					
						
						
							
							Merge branch 'feature/dialogue-frontend' into 'main'
						
						
						
						
						
						
						
						Feature/dialogue frontend
See merge request kernel-panic/revival!10 
						
						
					 | 
					
						2021-02-22 17:13:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f8ed8ee6d
							
						
					 | 
					
						
						
							
							power tweaks, scene & prefab fixes
						
						
						
						
						
						
					 | 
					
						2021-02-22 17:11:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60634152d3
							
						
					 | 
					
						
						
							
							play audio via FMOD using key from dialogue database
						
						
						
						
						
						
					 | 
					
						2021-02-22 15:29:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1fe3bbd79d
							
						
					 | 
					
						
						
							
							Merge branch 'main' into artefacts_list
						
						
						
						
						
						
					 | 
					
						2021-02-22 09:01:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							4397ec0326
							
						
					 | 
					
						
						
							
							Changed Artefact and ArtefactInventory to Scriptable objects
						
						
						
						
						
						
						
						Added artefact prefab 
						
						
					 | 
					
						2021-02-19 15:14:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							96860632ff
							
						
					 | 
					
						
						
							
							Feature/character controller
						
						
						
						
						
						
					 | 
					
						2021-02-15 18:09:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7a25b61f90
							
						
					 | 
					
						
						
							
							fixed ci issue
						
						
						
						
						
						
					 | 
					
						2021-02-12 14:12:26 +00:00 | 
					
					
						
						
							
							
							
						
					 |