joonasp
|
5bf99356ff
|
merge fixes and icebolt tweaks
|
2022-04-14 17:56:04 +03: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 |
|
|
|
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 |
|
|
|
f7e6a2e44b
|
started slime AI
|
2022-04-11 18:13:11 +03:00 |
|
|
|
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 |
|
|
|
6f7c3eaa9b
|
portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed
|
2022-04-10 18:06:16 +03:00 |
|
|
|
26e2d0d1db
|
Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into PauseMenu
|
2022-04-10 15:26:28 +03:00 |
|
|
|
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 |
|
|
|
8727b6d949
|
portals activated with gems + some small optims
|
2022-04-08 15:39:32 +03:00 |
|
|
|
5074c55bcf
|
fix on icebolt destroy, tree cutting included
|
2022-04-07 17:03:21 +03:00 |
|
|
|
ff362a6bdc
|
Merge branch 'staging' into unified_scene
|
2022-04-07 11:37:37 +00:00 |
|
|
|
0719c15400
|
Merge branch 'staging' into tree-cutting
|
2022-04-07 11:36:56 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e0f3c3e580
|
Fixed door interaction
|
2022-04-04 18:31:12 +03:00 |
|
|
|
194574ee65
|
Current version of pause menu panel to change settings while gameplay.
|
2022-04-04 17:15:27 +03:00 |
|
|
|
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 |
|
|
|
c539311caf
|
Merge branch 'staging' into portals-and-body
|
2022-03-29 09:30:41 +00:00 |
|
|
|
a71043121f
|
new character
|
2022-03-29 12:28:30 +03:00 |
|
|
|
8e50da0a93
|
added cuttable_tree and axe prefabs
|
2022-03-28 19:03:33 +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 |
|
|
|
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 |
|
|
|
c10f3421f5
|
Merge branch 'Shumpei' into portals-and-body
# Conflicts:
# Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
# Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
# Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
# Assets/Project Files/Scripts/Shumpei.meta
# Assets/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4.unitypackage.meta
|
2022-03-25 10:46:05 +02:00 |
|
|
|
e6cfaaf188
|
full body and animation, removed haptics that caused system crash
|
2022-03-24 22:50:55 +02:00 |
|
|
|
0cb487d781
|
portal interaction and VR body
|
2022-03-24 18:02:34 +02:00 |
|
|
|
c23213ad50
|
outline on hover
|
2022-03-21 18:36:45 +02:00 |
|
joonasp
|
f0649da5d3
|
sounds for prefabs
|
2022-03-21 17:52:47 +02:00 |
|
|
|
e2e9f175bb
|
Arm-swing and joystick locomotion
|
2022-03-21 17:09:21 +02:00 |
|
|
|
f76431d855
|
panel to toggle nodding on/off
|
2022-03-19 22:29:19 +02:00 |
|
joonasp
|
22e4260521
|
lever improvements, ready to be used
|
2022-03-18 20:35:45 +02:00 |
|
joonasp
|
6f8245e798
|
Initial minigame testing in scene
|
2022-03-17 17:24:46 +02:00 |
|
joonasp
|
f2c0c3d9a1
|
lever prefab, haptic events and more comments in lever code
|
2022-03-16 22:16:55 +02:00 |
|
joonasp
|
ec8a34daf5
|
initial lever system
|
2022-03-15 20:07:59 +02:00 |
|
