Commit Graph

6 Commits

Author SHA1 Message Date
jonasty 0d597af869 slime wandering 2022-04-25 16:34:38 +03:00
jonasty 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
HelarJ cd1633af54 Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2
# Conflicts:
#	Assets/SkyProfile-457889269655148736.asset
#	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
2022-04-11 18:53:05 +03:00
jonasty 82b7e7fbb2 merge commit 2022-04-11 18:46:10 +03:00
joonasp f7734432cc branch from homebase, icebolt collision issues 2022-04-11 13:58:13 +03:00
jonasty 8727b6d949 portals activated with gems + some small optims 2022-04-08 15:39:32 +03:00