|
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 |
|