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

95 Commits

Author SHA1 Message Date
jonasty 0d597af869 slime wandering 2022-04-25 16:34:38 +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
arlo 4df9180db1 slimes now die and disappear after death 2022-04-18 18:06:39 +03:00
jonasty 3813586b4c combat scene ready, adjusted slime texturemap for more color variety 2022-04-18 16:59:18 +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
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
joonasp 037432c393 playerinfo script and duplicate scene for testing 2022-04-08 22:16:25 +03:00
joonasp 9eaa6517c3 Merge branch 'staging' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into joonasp_Milestone2 2022-04-08 21:14:07 +03:00
jonasty 8727b6d949 portals activated with gems + some small optims 2022-04-08 15:39:32 +03:00
jonasty 5074c55bcf fix on icebolt destroy, tree cutting included 2022-04-07 17:03:21 +03:00
jonasty aa16a7ad45 Merge pull request 'Gameplay Loop v1' (#24) from unified_scene into staging 
Reviewed-on: #24
 2022-04-07 11:38:09 +00:00
jonasty ff362a6bdc Merge branch 'staging' into unified_scene 2022-04-07 11:37:37 +00:00
jonasty 0780b87291 Merge pull request 'Resource gathering - Tree cutting' (#25) from tree-cutting into staging 
Reviewed-on: #25
 2022-04-07 11:37:29 +00:00
jonasty 0719c15400 Merge branch 'staging' into tree-cutting 2022-04-07 11:36:56 +00:00
jonasty e1a4dab3f7 resource scene added, small optimizations of environment 2022-04-06 14:36:14 +03:00
jonasty 0596e060db homebase done portal room done 2022-04-05 20:53:02 +03:00
jonasty 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
arlo bf6bbc6723 log creation 2022-04-04 19:04:09 +03:00
joonasp c13d671975 Inventory and minigame tweaks 2022-04-04 18:57:40 +03:00
LAPTOP-NFGSIHNQ\shump e0f3c3e580 Fixed door interaction 2022-04-04 18:31:12 +03:00
LAPTOP-NFGSIHNQ\shump 194574ee65 Current version of pause menu panel to change settings while gameplay. 2022-04-04 17:15:27 +03:00
arlo 51d75b196d tree cut event 2022-04-04 16:09:59 +03:00
joonasp e671f77c77 item stack pop item, minigame additem method 2022-04-03 09:40:36 +03:00
jonasty 53893b63a6 Merge pull request 'staging' (#23) from staging into master 
Reviewed-on: #23
 2022-03-29 09:50:37 +00:00
jonasty aaf536d7ec Merge branch 'master' into staging 2022-03-29 09:50:02 +00:00
jonasty 808cbfd033 Merge pull request 'portals-and-body' (#21) from portals-and-body into staging 
Reviewed-on: #21
 2022-03-29 09:49:11 +00:00
jonasty c539311caf Merge branch 'staging' into portals-and-body 2022-03-29 09:30:41 +00:00