staging into master #20

Merged
helar merged 21 commits from staging into master 2022-03-28 14:44:02 +00:00

21 Commits

Author SHA1 Message Date
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
LAPTOP-NFGSIHNQ\shump 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
jonasty e6cfaaf188 full body and animation, removed haptics that caused system crash 2022-03-24 22:50:55 +02:00
jonasty 0cb487d781 portal interaction and VR body 2022-03-24 18:02:34 +02:00
arlo 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
LAPTOP-NFGSIHNQ\shump e2e9f175bb Arm-swing and joystick locomotion 2022-03-21 17:09:21 +02:00
arlo 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
joonasp c2767fe0d1 new branch joonasp 2022-03-15 10:20:33 +02:00