Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)
committerMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)
maps/runningman.map
maps/runningman.map.options
textures/exx/trim/trim_horz01_norm.tga
textures/map_stormkeep/brickfloor_norm.tga
textures/map_stormkeep/largebrick1a_norm.tga
textures/map_stormkeep/rock_norm.tga
textures/map_stormkeep/sand1a_norm.tga
textures/trak5x/misc/misc_pipez1a_norm.tga
textures/trak5x/misc/misc_thingy1a_norm.tga

index 8ab9a3d..b51f37b 100644 (file)
@@ -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
index df11364..a37f0ee 100644 (file)
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 5b
+Version: 5c
\ No newline at end of file
index 83c2298..87353b3 100644 (file)
Binary files a/textures/exx/trim/trim_horz01_norm.tga and b/textures/exx/trim/trim_horz01_norm.tga differ
index 47dd795..8e1f696 100644 (file)
Binary files a/textures/map_stormkeep/brickfloor_norm.tga and b/textures/map_stormkeep/brickfloor_norm.tga differ
index b3d221d..c306dce 100644 (file)
Binary files a/textures/map_stormkeep/largebrick1a_norm.tga and b/textures/map_stormkeep/largebrick1a_norm.tga differ
index 729588f..ab6d7b9 100644 (file)
Binary files a/textures/map_stormkeep/rock_norm.tga and b/textures/map_stormkeep/rock_norm.tga differ
index c547406..c7710dd 100644 (file)
Binary files a/textures/map_stormkeep/sand1a_norm.tga and b/textures/map_stormkeep/sand1a_norm.tga differ
index 612b775..75091ec 100644 (file)
Binary files a/textures/trak5x/misc/misc_pipez1a_norm.tga and b/textures/trak5x/misc/misc_pipez1a_norm.tga differ
index b52d291..a0f7172 100644 (file)
Binary files a/textures/trak5x/misc/misc_thingy1a_norm.tga and b/textures/trak5x/misc/misc_thingy1a_norm.tga differ