Merge branch 'stormkeep-caulk-fix' into 'master'

stormkeep: fix visible caulk

Fixes visible caulk near 25 armor.
![xonotic20161017213807-00](/uploads/c0e99ced0385f7b4bdc31864cbe19f7d/xonotic20161017213807-00.png)

See merge request !55

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 4e17d8b26b1f0d740e9e3ae619d62c025cd9db19..1aaf2a983d4901cc8d812b2523d1530f341ef9d5 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -2317,7 +2317,7 @@ map_stormkeep/largebrick1a
 ( 1104 -192 -192 ) ( 1104 -176 -160 ) ( 1104 -192 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 {
-( -96 1408 96 ) ( -96 1416 96 ) ( -96 1408 128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -192 1408 96 ) ( -192 1416 96 ) ( -192 1408 128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 240 1448 96 ) ( 240 1432 96 ) ( 240 1448 128 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -272 1472 96 ) ( -296 1472 96 ) ( -296 1408 96 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 240 1472 104 ) ( 72 1472 104 ) ( 72 1472 0 ) common/caulk 0 0 0 0.25 0.25 0 4 0
@@ -11001,10 +11001,10 @@ exx/base-metal03
 {
 ( -144 1472 96 ) ( -168 1472 96 ) ( -168 1408 96 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -256 1472 104 ) ( -256 1392 104 ) ( -256 1392 0 ) exx/base-metal01 268.2098999023 144.6786499023 20 0.25 0.25 0 0 0
-( 368 1472 104 ) ( 200 1472 104 ) ( 200 1472 0 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 368 1472 104 ) ( 200 1472 104 ) ( 200 1472 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
 ( 200 1408 104 ) ( 368 1408 104 ) ( 368 1408 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 200 1392 128 ) ( 200 1472 128 ) ( 368 1472 128 ) common/caulk 0 0 0 0.125 -0.125 0 0 0
-( -96 1416 96 ) ( -96 1408 96 ) ( -96 1408 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 1416 104 ) ( -192 1408 104 ) ( -192 1408 136 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -256 1424 -32 ) ( -256 1408 -32 ) ( -384 1424 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0