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 |
|
jonasty
|
a71043121f
|
new character
|
2022-03-29 12:28:30 +03:00 |
|
arlo
|
8e50da0a93
|
added cuttable_tree and axe prefabs
|
2022-03-28 19:03:33 +03:00 |
 helar
|
5d197d0958
|
Merge pull request 'staging into master' (#20) from staging into master
Reviewed-on: #20
|
2022-03-28 14:43:38 +00:00 |
|
joonasp
|
0bd4fcc0a0
|
joonasP scene missing prefabs replaced
|
2022-03-28 17:36:04 +03:00 |
|
HelarJ
|
af07a29f40
|
final changes
|
2022-03-28 17:00:22 +03:00 |
|
HelarJ
|
53bd10a13c
|
merge door to staging
|
2022-03-28 16:54:50 +03:00 |
|
HelarJ
|
99d412b258
|
merge minigame to staging
|
2022-03-28 16:52:34 +03:00 |
|
LAPTOP-NFGSIHNQ\shump
|
fb14e165d4
|
Door Interactions
|
2022-03-28 16:48:27 +03:00 |
|
HelarJ
|
72401758e2
|
merge highlight to staging
|
2022-03-28 16:46:33 +03:00 |
|
joonasp
|
06fde8ab2e
|
minigame node particles and despawn timer
|
2022-03-28 12:52:41 +03:00 |
|
HelarJ
|
8246a9ef8a
|
stackable inv objects, inv container
|
2022-03-28 10:08:54 +03:00 |
|
joonasp
|
851b7ae0da
|
essence minigame improvements
|
2022-03-25 18:03:38 +02:00 |