helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'Shumpei' into portals-and-body

Browse Source 
# 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
This commit is contained in:
LAPTOP-NFGSIHNQ\shump
2022-03-25 10:46:05 +02:00
parent e6cfaaf188 e2e9f175bb
commit c10f3421f5
24 changed files with 293 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
View File

@@ -1,5 +1,10 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
guid: c9f42f34fc0706c499aa448484f3db62
=======
guid: 20b2cd43130816e429a419c3adf589b0
folderAsset: yes
>>>>>>> Shumpei:Assets/Project Files/Scripts/Shumpei.meta
DefaultImporter:
externalObjects: {}
userData: