28 Commits

Author SHA1 Message Date
a748b342a8 wandering implemented 2022-04-25 17:41:22 +03:00
0d597af869 slime wandering 2022-04-25 16:34: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
3813586b4c combat scene ready, adjusted slime texturemap for more color variety 2022-04-18 16:59:18 +03:00
2fd2c37990 added world scene mountains to hide world borders 2022-04-17 22:56:07 +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
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
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
6f7c3eaa9b portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed 2022-04-10 18:06:16 +03:00
1f2af9127e portal vfx rework with spawn animation 2022-04-09 14:20:46 +03:00
9b4be15690 hand animations 2022-04-08 23:38:29 +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
0596e060db homebase done portal room done 2022-04-05 20:53:02 +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
c539311caf Merge branch 'staging' into portals-and-body 2022-03-29 09:30:41 +00:00
a71043121f new character 2022-03-29 12:28:30 +03:00
fb14e165d4 Door Interactions 2022-03-28 16:48:27 +03: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
e6cfaaf188 full body and animation, removed haptics that caused system crash 2022-03-24 22:50:55 +02:00
0cb487d781 portal interaction and VR body 2022-03-24 18:02:34 +02:00
e2e9f175bb Arm-swing and joystick locomotion 2022-03-21 17:09:21 +02:00
joonasp
6b9beee8f1 Merge and material conversion 2022-03-14 18:08:13 +02:00
HelarJ
884d399679 final 2022-03-14 16:45:35 +02:00
HelarJ
f55009fc67 merge jonasty 2022-03-14 16:45:24 +02:00
271d39c153 portals and dashing finalised 2022-03-14 16:20:51 +02:00
e82799c36a portals and dash. Also a bit of terrain building and level design 2022-03-13 00:26:35 +02:00