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

gemportal branch merge

Browse Source
This commit is contained in:
joonasp
2022-04-08 22:18:18 +03:00
parent 037432c393 8727b6d949
commit 09e7e26cbb
218 changed files with 32002 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_TerrainData/TerrainData_521113671563848736.asset
+78 -2
View File
File diff suppressed because one or more lines are too long
Assets/_TerrainData/TerrainData_699485723238748736.asset
+153
View File
File diff suppressed because one or more lines are too long
Assets/_TerrainData/TerrainData_869121471408748736.asset
+153
View File
File diff suppressed because one or more lines are too long
Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
+12
View File
@@ -27,17 +27,29 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
<<<<<<< HEAD
m_Texture: {fileID: -4654689040985271397, guid: b6bbea2e1167a7346822545139402874,
=======
m_Texture: {fileID: -8382209597607994568, guid: b6bbea2e1167a7346822545139402874,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
<<<<<<< HEAD
m_Texture: {fileID: 2844727453665291070, guid: b6bbea2e1167a7346822545139402874,
=======
m_Texture: {fileID: -5418273104343767497, guid: b6bbea2e1167a7346822545139402874,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
<<<<<<< HEAD
m_Texture: {fileID: 4259349063529903109, guid: b6bbea2e1167a7346822545139402874,
=======
m_Texture: {fileID: 4448014153531656217, guid: b6bbea2e1167a7346822545139402874,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
+12
View File
@@ -40,17 +40,29 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
<<<<<<< HEAD
m_Texture: {fileID: 6814411336743759160, guid: 726ce83d589353742be6b48ff467fc48,
=======
m_Texture: {fileID: -3679002471302179906, guid: 726ce83d589353742be6b48ff467fc48,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
<<<<<<< HEAD
m_Texture: {fileID: 9222750968982691349, guid: 726ce83d589353742be6b48ff467fc48,
=======
m_Texture: {fileID: 5517573790230051661, guid: 726ce83d589353742be6b48ff467fc48,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
<<<<<<< HEAD
m_Texture: {fileID: 3896593589085943192, guid: 726ce83d589353742be6b48ff467fc48,
=======
m_Texture: {fileID: -2372503177267332067, guid: 726ce83d589353742be6b48ff467fc48,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
+12
View File
@@ -40,17 +40,29 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
<<<<<<< HEAD
m_Texture: {fileID: 7347968026426540258, guid: 7f589c682d367b442b8cf75918f5aa55,
=======
m_Texture: {fileID: -7655403243227739187, guid: 7f589c682d367b442b8cf75918f5aa55,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
<<<<<<< HEAD
m_Texture: {fileID: -1762372347208809787, guid: 7f589c682d367b442b8cf75918f5aa55,
=======
m_Texture: {fileID: 5273791656863379916, guid: 7f589c682d367b442b8cf75918f5aa55,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
<<<<<<< HEAD
m_Texture: {fileID: -1736210976181236159, guid: 7f589c682d367b442b8cf75918f5aa55,
=======
m_Texture: {fileID: 2126150020230490587, guid: 7f589c682d367b442b8cf75918f5aa55,
>>>>>>> 8727b6d949dadf3fd01832a579bea529596737db
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}