| 
						
					 | 
					
						
						
						
						
							
						
						
							220ae7b8d2
							
						
					 | 
					
						
						
							
							fixed all triggers
						
						
						
						
						
						
					 | 
					
						2021-05-12 20:10:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							23b7c07c03
							
						
					 | 
					
						
						
							
							mergey boi
						
						
						
						
						
						
					 | 
					
						2021-05-12 19:08:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							247723cbda
							
						
					 | 
					
						
						
							
							reposition player and add collider to entrance
						
						
						
						
						
						
					 | 
					
						2021-05-12 18:45:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							53d74ff0bc
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/blink-rework
						
						
						
						
						
						
					 | 
					
						2021-05-12 18:36:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							882b83cb70
							
						
					 | 
					
						
						
							
							main integration
						
						
						
						
						
						
					 | 
					
						2021-05-12 18:32:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							68b8f0be19
							
						
					 | 
					
						
						
							
							blink rework
						
						
						
						
						
						
					 | 
					
						2021-05-12 18:26:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d7f4686316
							
						
					 | 
					
						
						
							
							blink gauntlet design
						
						
						
						
						
						
					 | 
					
						2021-05-12 16:56:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							88135bac17
							
						
					 | 
					
						
						
							
							Merge branch 'main' into fix/arrow-trap-scale
						
						
						
						
						
						
					 | 
					
						2021-05-12 13:46:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f93548787b
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/teleport
						
						
						
						
						
						
					 | 
					
						2021-05-11 18:15:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31e96f7261
							
						
					 | 
					
						
						
							
							basic rework
						
						
						
						
						
						
					 | 
					
						2021-05-11 17:55:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3caf16655f
							
						
					 | 
					
						
						
							
							add more sensible arrow mesh
						
						
						
						
						
						
					 | 
					
						2021-05-11 17:55:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbe71cdcea
							
						
					 | 
					
						
						
							
							add jetpack
						
						
						
						
						
						
					 | 
					
						2021-05-11 01:48:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							44ca53b755
							
						
					 | 
					
						
						
							
							add teleporter
						
						
						
						
						
						
					 | 
					
						2021-05-10 23:29:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aaff82b0d1
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/teleport
						
						
						
						
						
						
					 | 
					
						2021-05-10 22:50:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							763bd202c4
							
						
					 | 
					
						
						
							
							Merge branch 'feature/blink-rework' into 'main'
						
						
						
						
						
						
						
						sorted environment node into prefabs
See merge request kernel-panic/revival!82 
						
						
					 | 
					
						2021-05-10 19:25:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1637f9b038
							
						
					 | 
					
						
						
							
							Merge branch '119-final-level' into 'main'
						
						
						
						
						
						
						
						Resolve "level design: all together now"
Closes #119
See merge request kernel-panic/revival!79 
						
						
					 | 
					
						2021-05-10 16:29:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ac0da2c08
							
						
					 | 
					
						
						
							
							sorted environment node into prefabs
						
						
						
						
						
						
					 | 
					
						2021-05-10 17:16:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c18e1937d2
							
						
					 | 
					
						
						
							
							adjust some prefabs
						
						
						
						
						
						
					 | 
					
						2021-05-10 12:55:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e2c410410a
							
						
					 | 
					
						
						
							
							test build lighting
						
						
						
						
						
						
					 | 
					
						2021-05-10 11:23:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							609e25b158
							
						
					 | 
					
						
						
							
							added prefab of the final level
						
						
						
						
						
						
					 | 
					
						2021-05-09 13:56:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ca454bb258
							
						
					 | 
					
						
						
							
							complete boost level sequence
						
						
						
						
						
						
					 | 
					
						2021-05-01 02:01:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							93861ef0a4
							
						
					 | 
					
						
						
							
							apply trim to boost gauntlet
						
						
						
						
						
						
					 | 
					
						2021-04-29 02:24:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							94d6c95998
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2021-04-28 21:37:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1eab207201
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2021-04-28 19:26:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5590a93171
							
						
					 | 
					
						
						
							
							start work on tunnel teleport
						
						
						
						
						
						
					 | 
					
						2021-04-28 15:58:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							780df95b8a
							
						
					 | 
					
						
						
							
							lighting experiments
						
						
						
						
						
						
					 | 
					
						2021-04-28 00:50:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3cd4fdb0fe
							
						
					 | 
					
						
						
							
							design second boost level
						
						
						
						
						
						
					 | 
					
						2021-04-28 00:27:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7ada25aa1
							
						
					 | 
					
						
						
							
							give baz a drink and improve cameras
						
						
						
						
						
						
					 | 
					
						2021-04-27 22:41:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							4285e6b518
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2021-04-27 21:31:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							77d43c1c00
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/level-design
						
						
						
						
						
						
					 | 
					
						2021-04-27 21:10:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6100db30f
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/trim2
						
						
						
						
						
						
					 | 
					
						2021-04-27 20:44:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0464502d56
							
						
					 | 
					
						
						
							
							environment prefabs in preparation for merge
						
						
						
						
						
						
					 | 
					
						2021-04-27 20:36:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CharlieTinley
							
						 
					 | 
					
						
						
						
						
							
						
						
							aac16946d1
							
						
					 | 
					
						
						
							
							Trim 2 assets, with materials and lighting changes
						
						
						
						
						
						
					 | 
					
						2021-04-27 13:02:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							913c4d2231
							
						
					 | 
					
						
						
							
							import baz and disable dir lights in freeze rooms
						
						
						
						
						
						
					 | 
					
						2021-04-27 03:39:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4fdeabc7f0
							
						
					 | 
					
						
						
							
							buncha level design, prefabs and stuff
						
						
						
						
						
						
					 | 
					
						2021-04-27 00:57:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							51437264fc
							
						
					 | 
					
						
						
							
							wip
						
						
						
						
						
						
					 | 
					
						2021-04-26 19:12:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d6854cf0c
							
						
					 | 
					
						
						
							
							create more environment prefabs
						
						
						
						
						
						
					 | 
					
						2021-04-26 17:32:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5201402bce
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/glitch
						
						
						
						
						
						
					 | 
					
						2021-04-25 23:52:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c8ff85cf1
							
						
					 | 
					
						
						
							
							bunch of glitchy stuff, temple prefab
						
						
						
						
						
						
					 | 
					
						2021-04-25 23:44:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							f91b7918b3
							
						
					 | 
					
						
						
							
							moved char to starting position
						
						
						
						
						
						
					 | 
					
						2021-04-25 20:08:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3344196f49
							
						
					 | 
					
						
						
							
							camera pass and start temple prefab
						
						
						
						
						
						
					 | 
					
						2021-04-25 05:16:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b192263344
							
						
					 | 
					
						
						
							
							add vertex floatiness uwu
						
						
						
						
						
						
					 | 
					
						2021-04-25 00:59:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b91e97984f
							
						
					 | 
					
						
						
							
							bunch of glitchy graphics stuff idk
						
						
						
						
						
						
					 | 
					
						2021-04-24 02:06:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novvator
							
						 
					 | 
					
						
						
						
						
							
						
						
							71a3b48a78
							
						
					 | 
					
						
						
							
							doors now close when the player dies, changes in main to make it work
						
						
						
						
						
						
					 | 
					
						2021-04-21 16:42:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3a2296e1bf
							
						
					 | 
					
						
						
							
							remove trap from opening courtyard and add floor
						
						
						
						
						
						
					 | 
					
						2021-04-16 20:42:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bff72788e6
							
						
					 | 
					
						
						
							
							make puzzle more forgiving
						
						
						
						
						
						
					 | 
					
						2021-04-16 20:28:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9d9de550e1
							
						
					 | 
					
						
						
							
							tune bloom and match controls to prompt
						
						
						
						
						
						
					 | 
					
						2021-04-16 20:19:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c7ca3c48c
							
						
					 | 
					
						
						
							
							artefact control prefabs
						
						
						
						
						
						
					 | 
					
						2021-04-16 19:55:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							120e7574d0
							
						
					 | 
					
						
						
							
							add gloves lol
						
						
						
						
						
						
					 | 
					
						2021-04-16 19:31:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							338868d041
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/menus
						
						
						
						
						
						
					 | 
					
						2021-04-16 16:39:06 +01:00 | 
					
					
						
						
							
							
							
						
					 |