| 
						
					 | 
					
						
						
						
						
							
						
						
							ba3d232088
							
						
					 | 
					
						
						
							
							made button bois pretty
						
						
						
						
						
						
					 | 
					
						2021-03-12 00:39:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ecd6bab441
							
						
					 | 
					
						
						
							
							juiced artefact unlock screen
						
						
						
						
						
						
					 | 
					
						2021-03-11 19:34:32 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							69e68e4879
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feature/menus
						
						
						
						
						
						
					 | 
					
						2021-03-05 14:16:58 +00: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f2cf6256c1
							
						
					 | 
					
						
						
							
							menu WIP
						
						
						
						
						
						
					 | 
					
						2021-03-01 17:57:41 +00:00 | 
					
					
						
						
							
							
							
						
					 |