Commit Graph

4 Commits

Author SHA1 Message Date
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
jonasty 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 4922174840 shield color change on lifetime 2022-04-18 14:14:48 +03:00
jonasty 6f7c3eaa9b portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed 2022-04-10 18:06:16 +03:00