| 
							
							
								 HelarJ | c085a629af | Merge remote-tracking branch 'origin/gesture_joonasp' # Conflicts:
#	Assets/_TerrainData/TerrainData_521113671563848736.asset
#	Assets/_TerrainData/TerrainData_699485723238748736.asset
#	Assets/_TerrainData/TerrainData_869121471408748736.asset
#	Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
#	Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
#	Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
#	ProjectSettings/EditorBuildSettings.asset | 2022-04-25 16:17:38 +03:00 |  | 
			
				
					|  | b51388d292 | added spawns for slimes, boss slime added. blocker for final area added + key to unlock | 2022-04-25 15:29:04 +03:00 |  | 
			
				
					| 
							
							
								 joonasp | 06045c07fb | shield cast sound | 2022-04-25 12:26:34 +03:00 |  | 
			
				
					| 
							
							
								 joonasp | ad1a931c41 | shield spell, ice bolt adjustments, training dummys | 2022-04-18 11:29:26 +03:00 |  | 
			
				
					|  | 2a996b6feb | combatlevel world done | adjusts in portal script to allow for scenemanagement | waiting for ai to finish. need to write enemy spawner scripts | 2022-04-17 22:18:13 +03:00 |  | 
			
				
					| 
							
							
								 joonasp | 5bf99356ff | merge fixes and icebolt tweaks | 2022-04-14 17:56:04 +03:00 |  | 
			
				
					|  | 6f7c3eaa9b | portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed | 2022-04-10 18:06:16 +03:00 |  | 
			
				
					|  | 8727b6d949 | portals activated with gems + some small optims | 2022-04-08 15:39:32 +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 |  | 
			
				
					| 
							
							
								 HelarJ | 53bd10a13c | merge door to staging | 2022-03-28 16:54:50 +03:00 |  | 
			
				
					|  | fb14e165d4 | Door Interactions | 2022-03-28 16:48:27 +03:00 |  | 
			
				
					| 
							
							
								 joonasp | 06fde8ab2e | minigame node particles and despawn timer | 2022-03-28 12:52:41 +03:00 |  | 
			
				
					| 
							
							
								 joonasp | 851b7ae0da | essence minigame improvements | 2022-03-25 18:03:38 +02:00 |  | 
			
				
					|  | c10f3421f5 | Merge branch 'Shumpei' into portals-and-body # Conflicts:
#	Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
#	Assets/Project Files/Scripts/Shumpei.meta
#	Assets/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4.unitypackage.meta | 2022-03-25 10:46:05 +02:00 |  | 
			
				
					|  | 0cb487d781 | portal interaction and VR body | 2022-03-24 18:02:34 +02:00 |  | 
			
				
					| 
							
							
								 joonasp | f0649da5d3 | sounds for prefabs | 2022-03-21 17:52:47 +02:00 |  | 
			
				
					|  | e2e9f175bb | Arm-swing and joystick locomotion | 2022-03-21 17:09:21 +02:00 |  | 
			
				
					| 
							
							
								 joonasp | ec8a34daf5 | initial lever system | 2022-03-15 20:07:59 +02:00 |  | 
			
				
					| 
							
							
								 HelarJ | 670765ef3b | Update pack to URP | 2022-03-14 18:14:44 +02:00 |  | 
			
				
					| 
							
							
								 HelarJ | 1041b946b6 | final v2 | 2022-03-14 16:52:00 +02:00 |  | 
			
				
					| 
							
							
								 HelarJ | f55009fc67 | merge jonasty | 2022-03-14 16:45:24 +02:00 |  | 
			
				
					| 
							
							
								 HelarJ | 54d7e65045 | first | 2022-03-14 16:33:09 +02:00 |  | 
			
				
					| 
							
							
								 HelarJ | 98dac07345 | third person teleporting, grab interactables | 2022-03-14 14:21: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 |  | 
			
				
					|  | 813cd0c451 | init assets and filemgt | 2022-03-07 18:33:30 +02:00 |  | 
			
				
					| 
							
							
								 Helar Jaadla | 6940ac3a4b | oculus suggested quality settings | 2022-03-07 17:59:51 +02:00 |  | 
			
				
					| 
							
							
								 Helar Jaadla | cbeb10ec35 | clean project | 2022-03-07 17:52:41 +02:00 |  |