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

Merge remote-tracking branch 'origin/gesture_joonasp'

Browse Source 
# Conflicts:
#	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
#	ProjectSettings/EditorBuildSettings.asset
This commit is contained in:
HelarJ
2022-04-25 16:17:38 +03:00
parent 34035c5b3d 73dd34ba61
commit c085a629af
32 changed files with 11075 additions and 44160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/yos/yos shield/yos shield.mat
View File

@@ -100,7 +100,7 @@ Material:
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color0: {r: 1.5507064, g: 15.19919, b: 29.6185, a: 0}
- _Color0: {r: 7.3553696, g: 17.679485, b: 28.351603, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []