HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd4432fc6d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/PauseMenu' into staging2
						
						
						
						
						
						
						
						# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/TagManager.asset 
						
						
					 | 
					
						2022-04-11 19:10:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1ed57d5c31
							
						
					 | 
					
						
						
							
							Add menu scene, scene transition, simple position save and load
						
						
						
						
						
						
					 | 
					
						2022-04-11 16:34:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5074c55bcf
							
						
					 | 
					
						
						
							
							fix on icebolt destroy, tree cutting included
						
						
						
						
						
						
					 | 
					
						2022-04-07 17:03:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ccafc9e970
							
						
					 | 
					
						
						
							
							unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character
						
						
						
						
						
						
					 | 
					
						2022-04-05 10:21:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							194574ee65
							
						
					 | 
					
						
						
							
							Current version of pause menu panel to change settings while gameplay.
						
						
						
						
						
						
					 | 
					
						2022-04-04 17:15:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb14e165d4
							
						
					 | 
					
						
						
							
							Door Interactions
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:48:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							f55009fc67
							
						
					 | 
					
						
						
							
							merge jonasty
						
						
						
						
						
						
					 | 
					
						2022-03-14 16:45:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e82799c36a
							
						
					 | 
					
						
						
							
							portals and dash. Also a bit of terrain building and level design
						
						
						
						
						
						
					 | 
					
						2022-03-13 00:26:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							b42bfd3c5e
							
						
					 | 
					
						
						
							
							Unity render pipeline upgrade, velocity based vignette system (may encounter problems on merge)
						
						
						
						
						
						
					 | 
					
						2022-03-12 21:38:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Helar Jaadla
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbeb10ec35
							
						
					 | 
					
						
						
							
							clean project
						
						
						
						
						
						
					 | 
					
						2022-03-07 17:52:41 +02:00 | 
					
					
						
						
							
							
							
						
					 |