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

8e50da0a93 added cuttable_tree and axe prefabs

e671f77c77 item stack pop item, minigame additem method

51d75b196d tree cut event

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

e0f3c3e580 Fixed door interaction

c13d671975 Inventory and minigame tweaks

bf6bbc6723 log creation

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

0596e060db homebase done portal room done

e1a4dab3f7 resource scene added, small optimizations of environment

0719c15400 Merge branch 'staging' into tree-cutting

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

Reviewed-on: #25

ff362a6bdc Merge branch 'staging' into unified_scene

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

Reviewed-on: #24

5074c55bcf fix on icebolt destroy, tree cutting included

8727b6d949 portals activated with gems + some small optims

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

037432c393 playerinfo script and duplicate scene for testing

09e7e26cbb gemportal branch merge

9b4be15690 hand animations

1f2af9127e portal vfx rework with spawn animation

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

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

f7734432cc branch from homebase, icebolt collision issues

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

ba8883786b Changed to portal transition

f7e6a2e44b started slime AI

f032bb323a essence add to playerinfo

82b7e7fbb2 merge commit

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

ec2dd764d4 merge joonasp joonasty

ca41eda129 merge joonasp's branches

029c6cf7ba comment out missing playerinfo methods

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

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

5f55b04eba merge arlo

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.

No reviewers

No Label

Player mechanics

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: helar/Heroes_of_Hiis#26

No description provided.