joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							86d16e0cf2
							
						
					 | 
					
						
						
							
							small fixes
						
						
						
						
						
						
					 | 
					
						2022-05-16 17:47:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6571056d18
							
						
					 | 
					
						
						
							
							loot table added - AI improved a bit
						
						
						
						
						
						
					 | 
					
						2022-05-02 14:28:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a748b342a8
							
						
					 | 
					
						
						
							
							wandering implemented
						
						
						
						
						
						
					 | 
					
						2022-04-25 17:41:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd683b4580
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis
						
						
						
						
						
						
					 | 
					
						2022-04-25 16:35:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d597af869
							
						
					 | 
					
						
						
							
							slime wandering
						
						
						
						
						
						
					 | 
					
						2022-04-25 16:34:38 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							73dd34ba61
							
						
					 | 
					
						
						
							
							crafting tweaks
						
						
						
						
						
						
					 | 
					
						2022-04-25 16:06:41 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							effc8d18fd
							
						
					 | 
					
						
						
							
							sheld passive sound, initial crafting (2x wood = wand, wand + wood = damage up)
						
						
						
						
						
						
					 | 
					
						2022-04-25 11:46:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							4922174840
							
						
					 | 
					
						
						
							
							shield color change on lifetime
						
						
						
						
						
						
					 | 
					
						2022-04-18 14:14:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3c991bd09
							
						
					 | 
					
						
						
							
							start minigame with gesure named "Circle"
						
						
						
						
						
						
					 | 
					
						2022-04-18 12:08:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad1a931c41
							
						
					 | 
					
						
						
							
							shield spell, ice bolt adjustments, training dummys
						
						
						
						
						
						
					 | 
					
						2022-04-18 11:29:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							5bf99356ff
							
						
					 | 
					
						
						
							
							merge fixes and icebolt tweaks
						
						
						
						
						
						
					 | 
					
						2022-04-14 17:56:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f55b04eba
							
						
					 | 
					
						
						
							
							merge arlo
						
						
						
						
						
						
					 | 
					
						2022-04-11 19:13:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec2dd764d4
							
						
					 | 
					
						
						
							
							merge joonasp joonasty
						
						
						
						
						
						
					 | 
					
						2022-04-11 18:56:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f032bb323a
							
						
					 | 
					
						
						
							
							essence add to playerinfo
						
						
						
						
						
						
					 | 
					
						2022-04-11 18:27:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7e6a2e44b
							
						
					 | 
					
						
						
							
							started slime AI
						
						
						
						
						
						
					 | 
					
						2022-04-11 18:13:11 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7734432cc
							
						
					 | 
					
						
						
							
							branch from homebase, icebolt collision issues
						
						
						
						
						
						
					 | 
					
						2022-04-11 13:58:13 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff362a6bdc
							
						
					 | 
					
						
						
							
							Merge branch 'staging' into unified_scene
						
						
						
						
						
						
					 | 
					
						2022-04-07 11:37:37 +00: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf6bbc6723
							
						
					 | 
					
						
						
							
							log creation
						
						
						
						
						
						
					 | 
					
						2022-04-04 19:04:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							51d75b196d
							
						
					 | 
					
						
						
							
							tree cut event
						
						
						
						
						
						
					 | 
					
						2022-04-04 16:09:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e50da0a93
							
						
					 | 
					
						
						
							
							added cuttable_tree and axe prefabs
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:03:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							af07a29f40
							
						
					 | 
					
						
						
							
							final changes
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:00:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							53bd10a13c
							
						
					 | 
					
						
						
							
							merge door to staging
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:54:50 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							99d412b258
							
						
					 | 
					
						
						
							
							merge minigame to staging
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:52:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							72401758e2
							
						
					 | 
					
						
						
							
							merge highlight to staging
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:46:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							06fde8ab2e
							
						
					 | 
					
						
						
							
							minigame node particles and despawn timer
						
						
						
						
						
						
					 | 
					
						2022-03-28 12:52:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								HelarJ
							
						 
					 | 
					
						
						
						
						
							
						
						
							8246a9ef8a
							
						
					 | 
					
						
						
							
							stackable inv objects, inv container
						
						
						
						
						
						
					 | 
					
						2022-03-28 10:08:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							851b7ae0da
							
						
					 | 
					
						
						
							
							essence minigame improvements
						
						
						
						
						
						
					 | 
					
						2022-03-25 18:03:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0cb487d781
							
						
					 | 
					
						
						
							
							portal interaction and VR body
						
						
						
						
						
						
					 | 
					
						2022-03-24 18:02:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c23213ad50
							
						
					 | 
					
						
						
							
							outline on hover
						
						
						
						
						
						
					 | 
					
						2022-03-21 18:36:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0649da5d3
							
						
					 | 
					
						
						
							
							sounds for prefabs
						
						
						
						
						
						
					 | 
					
						2022-03-21 17:52:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							22e4260521
							
						
					 | 
					
						
						
							
							lever improvements, ready to be used
						
						
						
						
						
						
					 | 
					
						2022-03-18 20:35:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f8245e798
							
						
					 | 
					
						
						
							
							Initial minigame testing in scene
						
						
						
						
						
						
					 | 
					
						2022-03-17 17:24:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2c0c3d9a1
							
						
					 | 
					
						
						
							
							lever prefab, haptic events and more comments in lever code
						
						
						
						
						
						
					 | 
					
						2022-03-16 22:16:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec8a34daf5
							
						
					 | 
					
						
						
							
							initial lever system
						
						
						
						
						
						
					 | 
					
						2022-03-15 20:07:59 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								joonasp
							
						 
					 | 
					
						
						
						
						
							
						
						
							f48d160bd3
							
						
					 | 
					
						
						
							
							XR interaction toolkit holsters, flying with physics
						
						
						
						
						
						
					 | 
					
						2022-03-10 17:25:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							813cd0c451
							
						
					 | 
					
						
						
							
							init assets and filemgt
						
						
						
						
						
						
					 | 
					
						2022-03-07 18:33:30 +02:00 | 
					
					
						
						
							
							
							
						
					 |