helar/Heroes_of_Hiis

staging2 #26

Merged

helar merged 35 commits from staging2 into master

2022-04-11 16:26:06 +00:00

helar commented

2022-04-11 16:25:57 +00:00

Owner

No description provided.

helar added 35 commits 2022-04-11 16:25:57 +00:00

added cuttable_tree and axe prefabs 8e50da0a93

item stack pop item, minigame additem method e671f77c77

tree cut event 51d75b196d

Current version of pause menu panel to change settings while gameplay. 194574ee65

Fixed door interaction e0f3c3e580

Inventory and minigame tweaks c13d671975

log creation bf6bbc6723

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 ccafc9e970

homebase done portal room done 0596e060db

resource scene added, small optimizations of environment e1a4dab3f7

Merge branch 'staging' into tree-cutting 0719c15400

Merge pull request 'Resource gathering - Tree cutting' (#25 ) from tree-cutting into staging 0780b87291

Reviewed-on: #25

Merge branch 'staging' into unified_scene ff362a6bdc

Merge pull request 'Gameplay Loop v1' (#24 ) from unified_scene into staging aa16a7ad45

Reviewed-on: #24

fix on icebolt destroy, tree cutting included 5074c55bcf

portals activated with gems + some small optims 8727b6d949

Merge branch 'staging' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into joonasp_Milestone2 9eaa6517c3

playerinfo script and duplicate scene for testing 037432c393

gemportal branch merge 09e7e26cbb

hand animations 9b4be15690

portal vfx rework with spawn animation 1f2af9127e

Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into PauseMenu 26e2d0d1db

portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed 6f7c3eaa9b

branch from homebase, icebolt collision issues f7734432cc

Add menu scene, scene transition, simple position save and load 1ed57d5c31

Changed to portal transition ba8883786b

started slime AI f7e6a2e44b

essence add to playerinfo f032bb323a

merge commit 82b7e7fbb2

Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2 cd1633af54

# 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

merge joonasp joonasty ec2dd764d4

merge joonasp's branches ca41eda129

comment out missing playerinfo methods 029c6cf7ba

Merge remote-tracking branch 'origin/PauseMenu' into staging2 fd4432fc6d

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/TagManager.asset

merge arlo 5f55b04eba

helar merged commit be8b9a987d into master

2022-04-11 16:26:06 +00:00

helar referenced this issue from a commit

2022-04-11 16:26:07 +00:00

Merge pull request 'staging2' (#26) from staging2 into master

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: helar/Heroes_of_Hiis#26

No description provided.