helar
/
Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity
116 Commits 22 Branches 0 Tags 1.3 GiB
Commit Graph

116 Commits

Author SHA1 Message Date
joonasp 86d16e0cf2 small fixes 2022-05-16 17:47:54 +03:00
HelarJ 9a104a8bd3 Merge branch 'loottable' 
# Conflicts:
#	Assets/Project Files/Scripts/Arlo/SlimeAI.cs
 2022-05-02 17:32:39 +03:00
jonasty cd5922d2b8 fix ai 2022-05-02 16:17:05 +03:00
jonasty 181ce32b7b t 2022-05-02 16:11:53 +03:00
jonasty 2beb3298c6 to master merge 2022-05-02 16:09:20 +03:00
jonasty 6571056d18 loot table added - AI improved a bit 2022-05-02 14:28:44 +03:00
arlo 5a83699fd1 fixes to slime death, attack function has proper timings 2022-04-25 18:05:53 +03:00
jonasty a748b342a8 wandering implemented 2022-04-25 17:41:22 +03:00
jonasty fd683b4580 Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis 2022-04-25 16:35:30 +03:00
jonasty 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
jonasty 34035c5b3d Merge pull request 'staging2' (#30) from staging2 into master 
Reviewed-on: #30
 2022-04-25 12:53:24 +00:00
jonasty feff9540ec Merge pull request 'combatscene' (#29) from combatscene into staging2 
Reviewed-on: #29
 2022-04-25 12:50:12 +00:00
jonasty f82cfa297e Merge branch 'staging2' into combatscene 2022-04-25 12:49:24 +00:00
jonasty 036fa40b82 Merge pull request 'slime-AI' (#28) from slime-AI into staging2 
Reviewed-on: #28
 2022-04-25 12:49:16 +00: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 96f2f41d9b script fix 2022-04-25 13:39:16 +03:00
joonasp 270acfd18d wand power value affects spells 2022-04-25 12:55:41 +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
arlo 4df9180db1 slimes now die and disappear after death 2022-04-18 18:06:39 +03:00
joonasp aeaf7f4b22 gesture relative to player 2022-04-18 17:35:55 +03:00
jonasty 3813586b4c combat scene ready, adjusted slime texturemap for more color variety 2022-04-18 16:59:18 +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 a997c06e99 shield costs 1 essence, sound played if trying with 0 essence, shield despawns in 5 sec 2022-04-18 11:52:14 +03:00
joonasp ad1a931c41 shield spell, ice bolt adjustments, training dummys 2022-04-18 11:29:26 +03:00
arlo 7926bcdef4 slime AI 2022-04-18 03:08:12 +03:00
jonasty 2fd2c37990 added world scene mountains to hide world borders 2022-04-17 22:56:07 +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
joonasp 5bf99356ff merge fixes and icebolt tweaks 2022-04-14 17:56:04 +03:00
helar be8b9a987d Merge pull request 'staging2' (#26) from staging2 into master 
Reviewed-on: #26
 2022-04-11 16:26:05 +00:00
HelarJ 5f55b04eba merge arlo 2022-04-11 19:13:05 +03:00
HelarJ fd4432fc6d Merge remote-tracking branch 'origin/PauseMenu' into staging2 
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/TagManager.asset
 2022-04-11 19:10:18 +03:00
HelarJ 029c6cf7ba comment out missing playerinfo methods 2022-04-11 19:08:35 +03:00
HelarJ ca41eda129 merge joonasp's branches 2022-04-11 19:03:18 +03:00
HelarJ ec2dd764d4 merge joonasp joonasty 2022-04-11 18:56:51 +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 f032bb323a essence add to playerinfo 2022-04-11 18:27:18 +03:00
arlo f7e6a2e44b started slime AI 2022-04-11 18:13:11 +03:00
LAPTOP-NFGSIHNQ\shump ba8883786b Changed to portal transition 2022-04-11 17:19:41 +03:00
LAPTOP-NFGSIHNQ\shump 1ed57d5c31 Add menu scene, scene transition, simple position save and load 2022-04-11 16:34:14 +03:00
joonasp f7734432cc branch from homebase, icebolt collision issues 2022-04-11 13:58:13 +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
LAPTOP-NFGSIHNQ\shump 26e2d0d1db Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into PauseMenu 2022-04-10 15:26:28 +03:00
jonasty 1f2af9127e portal vfx rework with spawn animation 2022-04-09 14:20:46 +03:00
jonasty 9b4be15690 hand animations 2022-04-08 23:38:29 +03:00
joonasp 09e7e26cbb gemportal branch merge 2022-04-08 22:18:18 +03:00