Go to file
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
Assets Merge branch 'Shumpei' into portals-and-body 2022-03-25 10:46:05 +02:00
Packages Merge branch 'Shumpei' into portals-and-body 2022-03-25 10:46:05 +02:00
ProjectSettings Merge branch 'Shumpei' into portals-and-body 2022-03-25 10:46:05 +02:00
.gitignore vsconfig added to gitign 2022-03-07 18:29:50 +02:00
InitCodeMarker clean project 2022-03-07 17:52:41 +02:00