BTH/fishtanks-assets
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of shard.imon.nu:Assets

Browse Source 
Conflicts:
	Models/TerrainFiveIstles/Bridges/MiddleBridge.mtl
This commit is contained in:
ViktorLjung
2014-06-04 05:13:06 +02:00
parent c5edf6bf49 637f866e2d
commit fa4272b3f7
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Models/TerrainFiveIstles/Bridges/BaseBridge.mtl
+6 -3
View File
@@ -9,7 +9,8 @@ Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 0.000000 d 0.000000
illum 2 illum 2
map_Kd C:\Users\Viktor\Litet Spelprojekt\FishTanks\assets\Models\Bridge\BridgeSegment\Texture.png map_Kd BridgeSegment/Texture.png
map_Bump BridgeSegment/NM.png
newmtl Bridge_Bridge_initialShadingGroup4_NONE newmtl Bridge_Bridge_initialShadingGroup4_NONE
Ns 96.078431 Ns 96.078431
@@ -19,7 +20,8 @@ Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 0.000000 d 0.000000
illum 2 illum 2
map_Kd C:\\Users\\Viktor\\Litet Spelprojekt\\FishTanks\\assets\\Models\\Bridge\\BridgeSegment\\Texture.png map_Kd BridgeSegment/Texture.png
map_Bump BridgeSegment/NM.png
newmtl Ramp_Ramp_initialShadingGroup2.001 newmtl Ramp_Ramp_initialShadingGroup2.001
Ns 96.078431 Ns 96.078431
@@ -29,4 +31,5 @@ Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 0.000000 d 0.000000
illum 2 illum 2
map_Kd C:\Users\Viktor\Litet Spelprojekt\FishTanks\assets\Models\Bridge\BridgeRamp\Texture.png map_Kd BridgeRamp/Texture.png
map_Bump BridgeRamp/NM.png
Models/TerrainFiveIstles/Bridges/BridgeRamp/NM.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 MiB

Models/TerrainFiveIstles/Bridges/BridgeRamp/Texture.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 MiB

Models/TerrainFiveIstles/Bridges/BridgeSegment/NM.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 MiB

Models/TerrainFiveIstles/Bridges/BridgeSegment/Texture.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

Models/TerrainFiveIstles/Bridges/MiddleBridge.mtl
+7 -4
View File
@@ -9,9 +9,10 @@ Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 0.000000 d 0.000000
illum 2 illum 2
map_Kd C:\\Users\\Viktor\\Litet Spelprojekt\\FishTanks\\assets\\Models\\Bridge\\BridgeSegment\\Texture.png map_Kd BridgeSegment/Texture.png
map_Bump BridgeSegment/NM.png
newmtl Bridge_Bridge_initialShadingGroup4_Texture.png.002 newmtl Bridge_Bridge_initialShadingGroup4_NONE
Ns 96.078431 Ns 96.078431
Ka 0.000000 0.000000 0.000000 Ka 0.000000 0.000000 0.000000
Kd 0.000000 0.000000 0.000000 Kd 0.000000 0.000000 0.000000
@@ -19,7 +20,8 @@ Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 0.000000 d 0.000000
illum 2 illum 2
map_Kd C:\Users\Viktor\Litet Spelprojekt\FishTanks\assets\Models\Bridge\BridgeSegment\Texture.png map_Kd BridgeSegment/Texture.png
map_Bump BridgeSegment/NM.png
newmtl Ramp_Ramp_initialShadingGroup2.001 newmtl Ramp_Ramp_initialShadingGroup2.001
Ns 96.078431 Ns 96.078431
@@ -29,4 +31,5 @@ Ks 0.500000 0.500000 0.500000
Ni 1.000000 Ni 1.000000
d 0.000000 d 0.000000
illum 2 illum 2
map_Kd C:\Users\Viktor\Litet Spelprojekt\FishTanks\assets\Models\Bridge\BridgeRamp\Texture.png map_Kd BridgeRamp/Texture.png
map_Bump BridgeRamp/NM.png