Commit Graph

Select branches

Hide Pull Requests

DoorInteration

InvSave

PauseMenu

Shumpei

arlo-movementmenu

combatscene

gesture_joonasp

inventory

joonasp_Milestone2

joonasp_Milestone3

loottable

master

portaloptim_vrhands

portals-and-body

projectile_enemy_logic

quest_version

slime-AI

slimeAI

staging

staging2

tree-cutting

unified_scene

#1

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

Mono Color

• 86d16e0cf2 small fixes master joonasp 2022-05-16 17:47:54 +0300
• 9da19a4c54 quest fx reduced version quest_version jonasty 2022-05-09 14:43:35 +0300
• d924a45ca6 Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis jonasty 2022-05-09 13:25:17 +0300
• b056a215c9 merge jonasty 2022-05-09 13:25:12 +0300
• 9a104a8bd3 Merge branch 'loottable' HelarJ 2022-05-02 17:32:39 +0300
• cd5922d2b8 fix ai #34 #33 loottable jonasty 2022-05-02 16:17:05 +0300
• 181ce32b7b t jonasty 2022-05-02 16:11:53 +0300
• 2beb3298c6 to master merge #32 jonasty 2022-05-02 16:09:20 +0300
• 6571056d18 loot table added - AI improved a bit jonasty 2022-05-02 14:28:44 +0300
• ea08d2704f Shield spell enter and exit animation projectile_enemy_logic joonasp 2022-05-02 12:15:46 +0300
• 9e3bb66973 Wand element crafting. Comments on projectile logic when assigning elements to enemies joonasp 2022-05-02 11:28:01 +0300
• 5a83699fd1 fixes to slime death, attack function has proper timings #35 arlo 2022-04-25 18:05:53 +0300
• f2db095ab9 projectile and enemy collision. Iniitial player death state (teleport to start) joonasp 2022-04-25 17:46:26 +0300
• a748b342a8 wandering implemented jonasty 2022-04-25 17:41:22 +0300
• fd683b4580 Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis jonasty 2022-04-25 16:35:30 +0300
• 0d597af869 slime wandering jonasty 2022-04-25 16:34:38 +0300
• c085a629af Merge remote-tracking branch 'origin/gesture_joonasp' HelarJ 2022-04-25 16:17:38 +0300
• 73dd34ba61 crafting tweaks #31 gesture_joonasp joonasp 2022-04-25 16:06:41 +0300
• 34035c5b3d Merge pull request 'staging2' (#30) from staging2 into master jonasty 2022-04-25 12:53:24 +0000
• feff9540ec Merge pull request 'combatscene' (#29) from combatscene into staging2 #30 staging2 jonasty 2022-04-25 12:50:12 +0000
• f82cfa297e Merge branch 'staging2' into combatscene #29 #27 combatscene jonasty 2022-04-25 12:49:24 +0000
• 036fa40b82 Merge pull request 'slime-AI' (#28) from slime-AI into staging2 jonasty 2022-04-25 12:49:16 +0000
• b51388d292 added spawns for slimes, boss slime added. blocker for final area added + key to unlock jonasty 2022-04-25 15:29:04 +0300
• 96f2f41d9b script fix joonasp 2022-04-25 13:39:16 +0300
• 270acfd18d wand power value affects spells joonasp 2022-04-25 12:55:41 +0300
• 06045c07fb shield cast sound joonasp 2022-04-25 12:26:34 +0300
• effc8d18fd sheld passive sound, initial crafting (2x wood = wand, wand + wood = damage up) joonasp 2022-04-25 11:46:51 +0300
• 4df9180db1 slimes now die and disappear after death #28 slime-AI arlo 2022-04-18 18:06:39 +0300
• aeaf7f4b22 gesture relative to player joonasp 2022-04-18 17:35:55 +0300
• 3813586b4c combat scene ready, adjusted slime texturemap for more color variety jonasty 2022-04-18 16:59:18 +0300
• 4922174840 shield color change on lifetime joonasp 2022-04-18 14:14:48 +0300
• b3c991bd09 start minigame with gesure named "Circle" joonasp 2022-04-18 12:08:55 +0300
• a997c06e99 shield costs 1 essence, sound played if trying with 0 essence, shield despawns in 5 sec joonasp 2022-04-18 11:52:14 +0300
• ad1a931c41 shield spell, ice bolt adjustments, training dummys joonasp 2022-04-18 11:29:26 +0300
• b1954dd40e Basic saving, currently hardcoded to the one "chest" inventory in HomeBase. Loads when scene name contains "Homebase" and saves when button pressed. InvSave HelarJ 2022-04-18 08:59:26 +0300
• 7926bcdef4 slime AI arlo 2022-04-18 03:08:12 +0300
• 2fd2c37990 added world scene mountains to hide world borders jonasty 2022-04-17 22:56:07 +0300
• 2a996b6feb combatlevel world done | adjusts in portal script to allow for scenemanagement | waiting for ai to finish. need to write enemy spawner scripts jonasty 2022-04-17 22:18:13 +0300
• 5bf99356ff merge fixes and icebolt tweaks joonasp 2022-04-14 17:56:04 +0300
• be8b9a987d Merge pull request 'staging2' (#26) from staging2 into master helar 2022-04-11 16:26:05 +0000
• 5f55b04eba merge arlo #26 HelarJ 2022-04-11 19:13:05 +0300
• fd4432fc6d Merge remote-tracking branch 'origin/PauseMenu' into staging2 HelarJ 2022-04-11 19:10:18 +0300
• 029c6cf7ba comment out missing playerinfo methods HelarJ 2022-04-11 19:08:35 +0300
• ca41eda129 merge joonasp's branches HelarJ 2022-04-11 19:03:18 +0300
• ec2dd764d4 merge joonasp joonasty HelarJ 2022-04-11 18:56:51 +0300
• cd1633af54 Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2 HelarJ 2022-04-11 18:53:05 +0300
• 82b7e7fbb2 merge commit portaloptim_vrhands jonasty 2022-04-11 18:46:10 +0300
• f032bb323a essence add to playerinfo joonasp_Milestone3 joonasp 2022-04-11 18:27:18 +0300
• f7e6a2e44b started slime AI slimeAI arlo 2022-04-11 18:13:11 +0300
• ba8883786b Changed to portal transition PauseMenu LAPTOP-NFGSIHNQ\shump 2022-04-11 17:19:41 +0300
• 1ed57d5c31 Add menu scene, scene transition, simple position save and load LAPTOP-NFGSIHNQ\shump 2022-04-11 16:34:14 +0300
• f7734432cc branch from homebase, icebolt collision issues joonasp 2022-04-11 13:58:13 +0300
• 6f7c3eaa9b portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed jonasty 2022-04-10 18:06:16 +0300
• 26e2d0d1db Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into PauseMenu LAPTOP-NFGSIHNQ\shump 2022-04-10 15:26:28 +0300
• 1f2af9127e portal vfx rework with spawn animation jonasty 2022-04-09 14:20:46 +0300
• 9b4be15690 hand animations jonasty 2022-04-08 23:38:29 +0300
• 09e7e26cbb gemportal branch merge joonasp_Milestone2 joonasp 2022-04-08 22:18:18 +0300
• 037432c393 playerinfo script and duplicate scene for testing joonasp 2022-04-08 22:16:25 +0300
• 9eaa6517c3 Merge branch 'staging' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into joonasp_Milestone2 joonasp 2022-04-08 21:14:07 +0300
• 8727b6d949 portals activated with gems + some small optims jonasty 2022-04-08 15:39:32 +0300
• 5074c55bcf fix on icebolt destroy, tree cutting included staging jonasty 2022-04-07 17:03:21 +0300
• aa16a7ad45 Merge pull request 'Gameplay Loop v1' (#24) from unified_scene into staging jonasty 2022-04-07 11:38:09 +0000
• ff362a6bdc Merge branch 'staging' into unified_scene #24 unified_scene jonasty 2022-04-07 11:37:37 +0000
• 0780b87291 Merge pull request 'Resource gathering - Tree cutting' (#25) from tree-cutting into staging jonasty 2022-04-07 11:37:29 +0000
• 0719c15400 Merge branch 'staging' into tree-cutting #25 tree-cutting jonasty 2022-04-07 11:36:56 +0000
• e1a4dab3f7 resource scene added, small optimizations of environment jonasty 2022-04-06 14:36:14 +0300
• 0596e060db homebase done portal room done jonasty 2022-04-05 20:53:02 +0300
• 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 jonasty 2022-04-05 10:21:55 +0300
• bf6bbc6723 log creation arlo 2022-04-04 19:04:09 +0300
• c13d671975 Inventory and minigame tweaks joonasp 2022-04-04 18:57:40 +0300
• e0f3c3e580 Fixed door interaction LAPTOP-NFGSIHNQ\shump 2022-04-04 18:31:12 +0300
• 194574ee65 Current version of pause menu panel to change settings while gameplay. LAPTOP-NFGSIHNQ\shump 2022-04-04 17:15:27 +0300
• 51d75b196d tree cut event arlo 2022-04-04 16:09:59 +0300
• e671f77c77 item stack pop item, minigame additem method joonasp 2022-04-03 09:40:36 +0300
• 53893b63a6 Merge pull request 'staging' (#23) from staging into master jonasty 2022-03-29 09:50:37 +0000
• aaf536d7ec Merge branch 'master' into staging #23 #22 jonasty 2022-03-29 09:50:02 +0000
• 808cbfd033 Merge pull request 'portals-and-body' (#21) from portals-and-body into staging jonasty 2022-03-29 09:49:11 +0000
• c539311caf Merge branch 'staging' into portals-and-body #21 #19 portals-and-body jonasty 2022-03-29 09:30:41 +0000
• a71043121f new character jonasty 2022-03-29 12:28:30 +0300
• 8e50da0a93 added cuttable_tree and axe prefabs arlo 2022-03-28 19:03:33 +0300
• 5d197d0958 Merge pull request 'staging into master' (#20) from staging into master helar 2022-03-28 14:43:38 +0000
• 0bd4fcc0a0 joonasP scene missing prefabs replaced #20 joonasp 2022-03-28 17:36:04 +0300
• af07a29f40 final changes HelarJ 2022-03-28 17:00:22 +0300
• 53bd10a13c merge door to staging HelarJ 2022-03-28 16:54:50 +0300
• 99d412b258 merge minigame to staging HelarJ 2022-03-28 16:52:34 +0300
• fb14e165d4 Door Interactions DoorInteration LAPTOP-NFGSIHNQ\shump 2022-03-28 16:48:27 +0300
• 72401758e2 merge highlight to staging HelarJ 2022-03-28 16:46:33 +0300
• 06fde8ab2e minigame node particles and despawn timer joonasp 2022-03-28 12:52:41 +0300
• 8246a9ef8a stackable inv objects, inv container inventory HelarJ 2022-03-28 10:08:54 +0300
• 851b7ae0da essence minigame improvements joonasp 2022-03-25 18:03:38 +0200
• c10f3421f5 Merge branch 'Shumpei' into portals-and-body LAPTOP-NFGSIHNQ\shump 2022-03-25 10:46:05 +0200
• e6cfaaf188 full body and animation, removed haptics that caused system crash jonasty 2022-03-24 22:50:55 +0200
• 0cb487d781 portal interaction and VR body jonasty 2022-03-24 18:02:34 +0200
• c23213ad50 outline on hover arlo-movementmenu arlo 2022-03-21 18:36:45 +0200
• f0649da5d3 sounds for prefabs joonasp 2022-03-21 17:52:47 +0200
• e2e9f175bb Arm-swing and joystick locomotion Shumpei LAPTOP-NFGSIHNQ\shump 2022-03-21 17:09:21 +0200
• f76431d855 panel to toggle nodding on/off arlo 2022-03-19 22:29:19 +0200
• 22e4260521 lever improvements, ready to be used joonasp 2022-03-18 20:35:45 +0200
• 6f8245e798 Initial minigame testing in scene joonasp 2022-03-17 17:24:46 +0200
• f2c0c3d9a1 lever prefab, haptic events and more comments in lever code joonasp 2022-03-16 22:16:55 +0200