staging into master #20

helar · 2022-03-28T14:42:57Z

helar commented

2022-03-28 14:42:57 +00:00

No description provided.

helar added 21 commits 2022-03-28 14:43:03 +00:00

c2767fe0d1 new branch joonasp

ec8a34daf5 initial lever system

f2c0c3d9a1 lever prefab, haptic events and more comments in lever code

6f8245e798 Initial minigame testing in scene

22e4260521 lever improvements, ready to be used

f76431d855 panel to toggle nodding on/off

e2e9f175bb Arm-swing and joystick locomotion

f0649da5d3 sounds for prefabs

c23213ad50 outline on hover

0cb487d781 portal interaction and VR body

e6cfaaf188 full body and animation, removed haptics that caused system crash

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

851b7ae0da essence minigame improvements

8246a9ef8a stackable inv objects, inv container

06fde8ab2e minigame node particles and despawn timer

72401758e2 merge highlight to staging

fb14e165d4 Door Interactions

99d412b258 merge minigame to staging

53bd10a13c merge door to staging

af07a29f40 final changes

0bd4fcc0a0 joonasP scene missing prefabs replaced

helar merged commit 5d197d0958 into master

2022-03-28 14:44:02 +00:00

helar referenced this issue from a commit