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

Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2

Browse Source 
# Conflicts:
#	Assets/SkyProfile-457889269655148736.asset
#	Assets/_TerrainData/TerrainData_521113671563848736.asset
#	Assets/_TerrainData/TerrainData_699485723238748736.asset
#	Assets/_TerrainData/TerrainData_869121471408748736.asset
#	Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
#	Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
#	Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
This commit is contained in:
HelarJ
2022-04-11 18:53:05 +03:00
parent 82b7e7fbb2 f032bb323a
commit cd1633af54
15 changed files with 39802 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Polaris - Low Poly Ecosystem/Polaris - Low Poly Terrain Engine/Editor/Packages/URP_Support.unitypackage.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 8bc88477f037e96478019bba8de301fd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: