Commit Graph

12 Commits

Author SHA1 Message Date
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
LAPTOP-NFGSIHNQ\shump fb14e165d4 Door Interactions 2022-03-28 16:48:27 +03: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
LAPTOP-NFGSIHNQ\shump e2e9f175bb Arm-swing and joystick locomotion 2022-03-21 17:09:21 +02:00
joonasp 6b9beee8f1 Merge and material conversion 2022-03-14 18:08:13 +02:00
HelarJ 884d399679 final 2022-03-14 16:45:35 +02:00
HelarJ f55009fc67 merge jonasty 2022-03-14 16:45:24 +02:00
jonasty 271d39c153 portals and dashing finalised 2022-03-14 16:20:51 +02:00
jonasty e82799c36a portals and dash. Also a bit of terrain building and level design 2022-03-13 00:26:35 +02:00