Merge branch 'master' into justin/erbium

diff --git a/maps/runningman.map b/maps/runningman.map
index 8ab9a3d8107bcf7478550450e9731d5068e6e15c..b51f37bb64f8c2015018b41cdb62c2f56b0929e2 100644 (file)
--- a/maps/runningman.map
+++ b/maps/runningman.map
@@ -4979,7 +4979,7 @@ trak5x/light-light3a-surfacelight_sRGB
 }
 {
 ( -464 280 320 ) ( -464 312 320 ) ( -464 280 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -448 704 384 ) ( -416 704 384 ) ( -416 288 384 ) common/caulk 0 0 90 0.25 -0.25 0 0 0
+( -448 704 384 ) ( -416 704 384 ) ( -416 288 384 ) exx/floor-wrn01-blue 0 0 90 0.25 -0.25 0 0 0
 ( -464 704 320 ) ( -496 704 320 ) ( -464 288 320 ) exx/floor-wrn01-blue 0 0 90 0.25 -0.25 0 0 0
 ( -320 256 0 ) ( 192 256 0 ) ( 192 256 -64 ) exx/floor-wrn01-blue 0 0 0 0.25 0.25 0 0 0
 ( 64 704 0 ) ( -448 704 0 ) ( -448 704 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0

diff --git a/maps/runningman.map.options b/maps/runningman.map.options
index df1136409993495569a9a255b3bc31913af5d311..a37f0ee8d0672df3a0f15be62051d69432f3b661 100644 (file)
--- a/maps/runningman.map.options
+++ b/maps/runningman.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 5b
+Version: 5c
\ No newline at end of file

diff --git a/textures/exx/trim/trim_horz01_norm.tga b/textures/exx/trim/trim_horz01_norm.tga
index 83c2298bba28bbe8a556eaf80851ad46f9e3f1bc..87353b33d85f59d1cf97efbb14988d228a165abf 100644 (file)
Binary files a/textures/exx/trim/trim_horz01_norm.tga and b/textures/exx/trim/trim_horz01_norm.tga differ

diff --git a/textures/map_stormkeep/brickfloor_norm.tga b/textures/map_stormkeep/brickfloor_norm.tga
index 47dd79554d40f44f9ca34991f238090b6a22174b..8e1f696e07496050054e8f8821812b65726bbf4c 100644 (file)
Binary files a/textures/map_stormkeep/brickfloor_norm.tga and b/textures/map_stormkeep/brickfloor_norm.tga differ

diff --git a/textures/map_stormkeep/largebrick1a_norm.tga b/textures/map_stormkeep/largebrick1a_norm.tga
index b3d221df37443f6759bc0c13bbef24122ec10ade..c306dce8ebcd7984fa3c46f1b54fb039f2ff93c1 100644 (file)
Binary files a/textures/map_stormkeep/largebrick1a_norm.tga and b/textures/map_stormkeep/largebrick1a_norm.tga differ

diff --git a/textures/map_stormkeep/rock_norm.tga b/textures/map_stormkeep/rock_norm.tga
index 729588fa81d6f7cd969ad5eb4b6420396a7f6523..ab6d7b9a7cda6fe8009e4667847b7f21baac053d 100644 (file)
Binary files a/textures/map_stormkeep/rock_norm.tga and b/textures/map_stormkeep/rock_norm.tga differ

diff --git a/textures/map_stormkeep/sand1a_norm.tga b/textures/map_stormkeep/sand1a_norm.tga
index c5474067babd5ee0cd2a6a65f0df6a13ac3288cd..c7710dd6d8a97cefdadc8af05a10f30aae24c539 100644 (file)
Binary files a/textures/map_stormkeep/sand1a_norm.tga and b/textures/map_stormkeep/sand1a_norm.tga differ

diff --git a/textures/trak5x/misc/misc_pipez1a_norm.tga b/textures/trak5x/misc/misc_pipez1a_norm.tga
index 612b775f2ecb70acf3c07ad78c0d356b378dfe45..75091ecfa5fa7ca7b6859459f00bef9a6d0c1b66 100644 (file)
Binary files a/textures/trak5x/misc/misc_pipez1a_norm.tga and b/textures/trak5x/misc/misc_pipez1a_norm.tga differ

diff --git a/textures/trak5x/misc/misc_thingy1a_norm.tga b/textures/trak5x/misc/misc_thingy1a_norm.tga
index b52d291469ae8f95ac1019ee0d1ff114037812ae..a0f7172682560e1cd31c61da3fde3233eec87338 100644 (file)
Binary files a/textures/trak5x/misc/misc_thingy1a_norm.tga and b/textures/trak5x/misc/misc_thingy1a_norm.tga differ