From: Mirio Date: Fri, 17 Mar 2017 18:39:38 +0000 (+0100) Subject: Fix visible caulk and a light X-Git-Tag: xonotic-v0.8.2~39 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=b5abbbb7db3afe88b27aa53c542bb193da1b068d;ds=sidebyside Fix visible caulk and a light --- diff --git a/maps/stormkeep.map b/maps/stormkeep.map index 55f648a4..88f26c8c 100644 --- a/maps/stormkeep.map +++ b/maps/stormkeep.map @@ -11055,7 +11055,7 @@ exx/base-metal03 ( -256 -1856 -64 ) ( -320 -1920 -64 ) ( -256 -1856 64 ) exx/base-metal04 368 0 -90 0.25 0.25 134217728 0 0 } { -( 576 704 448 ) ( 416 704 448 ) ( 576 736 320 ) common/caulk 241.7778015137 170.6667480469 0 0.1875 0.1875 134217728 0 0 +( 576 704 448 ) ( 416 704 448 ) ( 576 736 320 ) map_stormkeep/rock 241.7778015137 170.6667480469 0 0.1875 0.1875 134217728 0 0 ( 576 576 368 ) ( 576 704 368 ) ( 576 704 320 ) common/caulk 71.1115112305 170.6667480469 0 -0.1875 0.1875 134217728 0 0 ( 448 576 368 ) ( 592 576 368 ) ( 592 576 320 ) common/caulk 241.7778015137 170.6667480469 0 0.1875 0.1875 134217728 0 0 ( 448 576 320 ) ( 416 704 448 ) ( 448 576 448 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 @@ -11067,7 +11067,7 @@ exx/base-metal03 ( 576 576 448 ) ( 480 576 512 ) ( 576 576 512 ) common/caulk 241.7778015137 85.3334350586 0 0.1875 0.1875 134217728 0 0 ( 448 576 448 ) ( 416 704 448 ) ( 480 576 512 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 ( 576 576 448 ) ( 416 704 448 ) ( 448 576 448 ) common/caulk 71.1115112305 42.6667175293 -90 0.1875 0.1875 134217728 0 0 -( 576 576 512 ) ( 416 704 448 ) ( 576 704 448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 +( 576 576 512 ) ( 416 704 448 ) ( 576 704 448 ) map_stormkeep/rock 0 0 0 0.25 0.25 134217728 0 0 } { ( 640 192 512 ) ( 640 320 528 ) ( 640 192 448 ) common/caulk 71.1112060547 85.3334350586 0 -0.1875 0.1875 134217728 0 0 @@ -11146,7 +11146,7 @@ exx/base-metal03 } { ( 768 448 320 ) ( 960 448 512 ) ( 768 448 512 ) common/caulk 156.4449462891 85.3334350586 0 -0.1875 0.1875 134217728 0 0 -( 768 320 576 ) ( 768 320 448 ) ( 768 448 576 ) common/caulk 241.7778320313 85.3334350586 0 -0.1875 0.1875 134217728 0 0 +( 768 320 576 ) ( 768 320 448 ) ( 768 448 576 ) map_stormkeep/rock 241.7778320313 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 768 256 576 ) ( 768 448 512 ) ( 960 448 512 ) common/caulk 241.7778320313 127.9999389648 -90 0.1875 -0.1875 134217728 0 0 ( 832 320 320 ) ( 960 320 320 ) ( 832 448 320 ) common/caulk 241.7778320313 127.9999389648 -90 0.1875 -0.1875 134217728 0 0 ( 960 448 472 ) ( 1088 320 344 ) ( 837.375 126.25 602.625 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 @@ -11157,7 +11157,7 @@ exx/base-metal03 } { ( 768 576 448 ) ( 896 576 560 ) ( 768 576 560 ) common/caulk 71.1114501953 85.3334350586 0 -0.1875 0.1875 134217728 0 0 -( 768 448 448 ) ( 768 576 560 ) ( 768 448 512 ) common/caulk 156.4445800781 85.3334350586 0 -0.1875 0.1875 134217728 0 0 +( 768 448 448 ) ( 768 576 560 ) ( 768 448 512 ) map_stormkeep/rock 156.4445800781 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 768 448 320 ) ( 960 448 472 ) ( 960 448 320 ) map_stormkeep/rock 71.1114501953 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 896 576 320 ) ( 960 448 472 ) ( 896 576 528 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 ( 960 448 512 ) ( 768 576 560 ) ( 896 576 560 ) common/caulk 156.4445800781 213.3328857422 -90 0.1875 -0.1875 134217728 0 0 @@ -11166,7 +11166,7 @@ exx/base-metal03 } { ( 768 704 448 ) ( 896 704 576 ) ( 768 704 576 ) common/caulk 71.1114501953 85.3334350586 0 -0.1875 0.1875 134217728 0 0 -( 768 704 448 ) ( 768 704 576 ) ( 768 576 560 ) common/caulk 71.1112060547 85.3334350586 0 -0.1875 0.1875 134217728 0 0 +( 768 704 448 ) ( 768 704 576 ) ( 768 576 560 ) map_stormkeep/rock 71.1112060547 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 896 576 448 ) ( 768 576 560 ) ( 896 576 560 ) common/caulk 71.1114501953 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 896 576 528 ) ( 896 704 528 ) ( 896 704 320 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 ( 896 576 560 ) ( 768 704 576 ) ( 896 704 576 ) common/caulk 71.1112060547 213.3328857422 -90 0.1875 -0.1875 134217728 0 0 @@ -11175,7 +11175,7 @@ exx/base-metal03 } { ( 960 832 448 ) ( 960 832 512 ) ( 832 832 512 ) common/caulk 71.1114501953 85.3334350586 0 -0.1875 0.1875 134217728 0 0 -( 832 832 512 ) ( 768 704 576 ) ( 832 832 448 ) common/caulk 241.7779541016 85.3334350586 0 -0.1875 0.1875 134217728 0 0 +( 832 832 512 ) ( 768 704 576 ) ( 832 832 448 ) map_stormkeep/rock 241.7779541016 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 896 704 448 ) ( 768 704 576 ) ( 896 704 576 ) common/caulk 71.1114501953 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( 896 704 528 ) ( 960 832 464 ) ( 896 704 320 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 ( 960 832 512 ) ( 896 704 576 ) ( 768 704 576 ) common/caulk 241.7779541016 213.3328857422 -90 0.1875 -0.1875 134217728 0 0 @@ -11184,7 +11184,7 @@ exx/base-metal03 } { ( 832 960 512 ) ( 848 1088 320 ) ( 912 960 512 ) common/caulk 71.1114501953 170.6667480469 0 -0.1875 0.1875 134217728 0 0 -( 832 832 320 ) ( 832 1088 320 ) ( 832 960 512 ) common/caulk 156.4449462891 170.6667480469 0 -0.1875 0.1875 134217728 0 0 +( 832 832 320 ) ( 832 1088 320 ) ( 832 960 512 ) map_stormkeep/rock 156.4449462891 170.6667480469 0 -0.1875 0.1875 134217728 0 0 ( 912 960 512 ) ( 848 1088 320 ) ( 960 832 320 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0 ( 832 832 320 ) ( 848 1088 320 ) ( 832 1088 320 ) common/caulk 156.4449462891 213.3328857422 -90 0.1875 -0.1875 134217728 0 0 ( 816 832 320 ) ( 816 832 368 ) ( 960 832 368 ) common/caulk 71.1114501953 170.6667480469 0 -0.1875 0.1875 134217728 0 0 @@ -12386,14 +12386,14 @@ exx/base-metal03 ( -576 160 448 ) ( -640 288 320 ) ( -640 288 448 ) common/caulk 71.1111602783 170.6667480469 0 0.1875 0.1875 134217728 0 0 ( -512 288 448 ) ( -640 288 448 ) ( -640 288 320 ) common/caulk 241.777923584 170.6667480469 0 -0.1875 0.1875 134217728 0 0 ( -448 160 448 ) ( -512 288 448 ) ( -512 288 320 ) map_stormkeep/rock 384 0 0 -0.25 0.25 134217728 0 0 -( -448 160 320 ) ( -576 160 320 ) ( -512 288 448 ) common/caulk 71.1111602783 42.6669006348 90 0.1875 0.1875 134217728 0 0 +( -448 160 320 ) ( -576 160 320 ) ( -512 288 448 ) map_stormkeep/rock 71.1111602783 42.6669006348 90 0.1875 0.1875 134217728 0 0 ( -576 160 320 ) ( -512 288 320 ) ( -640 288 320 ) common/caulk 71.1111602783 42.6669006348 90 0.1875 0.1875 134217728 0 0 } { ( -640 288 576 ) ( -640 416 448 ) ( -640 416 576 ) common/caulk 156.4444122314 85.3334350586 0 0.1875 0.1875 134217728 0 0 ( -512 416 496 ) ( -640 416 496 ) ( -640 416 448 ) common/caulk 241.777923584 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( -512 288 576 ) ( -512 416 576 ) ( -512 416 448 ) map_stormkeep/rock 384 0 0 -0.25 0.25 134217728 0 0 -( -640 416 496 ) ( -512 416 496 ) ( -512 288 448 ) common/caulk 156.4444122314 42.6669006348 90 0.1875 0.1875 134217728 0 0 +( -640 416 496 ) ( -512 416 496 ) ( -512 288 448 ) map_stormkeep/rock 156.4444122314 42.6669006348 90 0.1875 0.1875 134217728 0 0 ( -640 288 448 ) ( -512 416 448 ) ( -640 416 448 ) common/caulk 156.4444122314 42.6669006348 90 0.1875 0.1875 134217728 0 0 } { @@ -12409,7 +12409,7 @@ exx/base-metal03 ( -640 416 576 ) ( -640 544 448 ) ( -640 544 576 ) common/caulk 241.7776641846 85.3334350586 0 0.1875 0.1875 134217728 0 0 ( -448 544 448 ) ( -448 544 576 ) ( -640 544 576 ) common/caulk 241.777923584 85.3334350586 0 -0.1875 0.1875 134217728 0 0 ( -448 544 576 ) ( -448 544 448 ) ( -512 416 576 ) map_stormkeep/rock 384 0 0 -0.25 0.25 134217728 0 0 -( -512 416 496 ) ( -640 416 496 ) ( -448 544 576 ) common/caulk 241.7776641846 42.6669006348 90 0.1875 0.1875 134217728 0 0 +( -512 416 496 ) ( -640 416 496 ) ( -448 544 576 ) map_stormkeep/rock 241.7776641846 42.6669006348 90 0.1875 0.1875 134217728 0 0 ( -640 416 448 ) ( -512 544 448 ) ( -640 544 448 ) common/caulk 241.7776641846 42.6669006348 90 0.1875 0.1875 134217728 0 0 } { @@ -12433,12 +12433,12 @@ exx/base-metal03 ( -320 768 448 ) ( -320 736 576 ) ( -320 640 448 ) common/caulk 241.7777709961 85.3334350586 0 0.1875 0.1875 134217728 0 0 ( -320 768 448 ) ( -96 768 448 ) ( -320 768 576 ) common/caulk 71.1112670898 85.3334350586 0 0.1875 0.1875 134217728 0 0 ( -320 736 576 ) ( -96 672 448 ) ( -320 672 448 ) map_stormkeep/rock 0 0 0 0.25 0.25 134217728 0 0 -( -320 736 576 ) ( -96 768 448 ) ( -96 672 448 ) common/caulk 71.1112670898 42.6667480469 0 0.1875 0.1875 134217728 0 0 +( -320 736 576 ) ( -96 768 448 ) ( -96 672 448 ) map_stormkeep/rock 71.1112670898 42.6667480469 0 0.1875 0.1875 134217728 0 0 ( -320 768 448 ) ( -96 672 448 ) ( -96 768 448 ) common/caulk 71.1112670898 42.6667480469 0 0.1875 0.1875 134217728 0 0 } { ( -64 768 368 ) ( -192 768 368 ) ( -192 768 320 ) common/caulk 156.4445800781 170.6667480469 0 0.1875 0.1875 134217728 0 0 -( 0 768 320 ) ( 0 672 320 ) ( -96 672 448 ) common/caulk 241.7777709961 170.6667480469 0 0.1875 0.1875 134217728 0 0 +( 0 768 320 ) ( 0 672 320 ) ( -96 672 448 ) map_stormkeep/rock 241.7777709961 170.6667480469 0 0.1875 0.1875 134217728 0 0 ( -64 672 448 ) ( -64 672 320 ) ( -192 672 448 ) map_stormkeep/rock 0 0 0 0.25 0.25 134217728 0 0 ( -96 768 448 ) ( -96 672 448 ) ( -320 672 448 ) common/caulk 156.4445800781 42.6667480469 0 0.1875 0.1875 134217728 0 0 ( 0 672 320 ) ( 0 768 320 ) ( -320 672 320 ) common/caulk 156.4445800781 42.6667480469 0 0.1875 0.1875 134217728 0 0 @@ -17844,17 +17844,17 @@ exx/base-metal01 ( -1072 -800 64 ) ( -1024 -864 64 ) ( -1072 -864 64 ) exx/floor-clang01 0 0 -90 0.25 -0.25 0 0 0 ( -896 -744 32 ) ( -912 -744 32 ) ( -912 -960 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -1056 -864 -32 ) ( -1056 -800 64 ) ( -1056 -864 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 -( -1004 -816 64 ) ( -1004 -848 32 ) ( -1004 -848 64 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 ( -1008 -816 -128 ) ( -1004 -820 -128 ) ( -1008 -816 0 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 ( -1008 -848 0 ) ( -1004 -844 -128 ) ( -1008 -848 -128 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -1008 -824 -64 ) ( -1008 -832 -64 ) ( -1008 -824 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { -( -928 -768 -32 ) ( -928 -768 64 ) ( -1056 -768 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 -( -1072 -752 64 ) ( -960 -800 64 ) ( -1072 -800 64 ) exx/floor-clang01 0 0 -90 0.25 -0.25 0 0 0 +( -1072 -752 64 ) ( -960 -800 64 ) ( -1072 -800 64 ) exx/trim-psimple05 128 0 90 0.125 0.125 0 0 0 ( -896 -744 32 ) ( -912 -744 32 ) ( -912 -960 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -1024 -800 64 ) ( -1024 -800 -32 ) ( -1056 -768 -32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -928 -768 64 ) ( -928 -768 -32 ) ( -960 -800 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -976 -820 64 ) ( -1008 -820 32 ) ( -1008 -820 64 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -992 -816 -64 ) ( -984 -816 -64 ) ( -992 -816 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { ( 128 -608 128 ) ( 128 -736 160 ) ( 128 -608 160 ) exx/light-u201-surfacelight_sRGB 384 0 0 0.25 0.25 0 4 0 @@ -18479,6 +18479,22 @@ exx/base-metal03 ( 1792 -1088 -96 ) ( 1772 -1108 -96 ) ( 1772 -1108 -32 ) exx/base-metal04 368 256 -90 0.25 0.25 134217728 0 0 ( 1792 -1088 64 ) ( 1776 -1088 -64 ) ( 1792 -1088 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 } +{ +( -928 -768 -32 ) ( -928 -768 64 ) ( -1056 -768 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -1072 -752 64 ) ( -960 -800 64 ) ( -1072 -800 64 ) exx/floor-clang01 0 0 -90 0.25 -0.25 0 0 0 +( -896 -744 32 ) ( -912 -744 32 ) ( -912 -960 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -1024 -800 64 ) ( -1024 -800 -32 ) ( -1056 -768 -32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -928 -768 64 ) ( -928 -768 -32 ) ( -960 -800 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -992 -816 64 ) ( -984 -816 -64 ) ( -992 -816 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -1072 -800 64 ) ( -1024 -864 64 ) ( -1072 -864 64 ) exx/trim-psimple05 128 0 0 0.125 0.125 0 0 0 +( -896 -744 32 ) ( -912 -744 32 ) ( -912 -960 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -1004 -816 64 ) ( -1004 -848 32 ) ( -1004 -848 64 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -1008 -816 -128 ) ( -1004 -820 -128 ) ( -1008 -816 0 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -1008 -848 0 ) ( -1004 -844 -128 ) ( -1008 -848 -128 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -1008 -824 64 ) ( -1008 -832 -64 ) ( -1008 -824 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} } { "classname" "func_group" @@ -22664,12 +22680,20 @@ exx/base-metal03 ( -768 -160 32 ) ( -736 -160 32 ) ( -768 -160 64 ) common/caulk 16 0 0 -0.5 0.5 0 0 0 } { -( -960 -912 64 ) ( -1072 -864 64 ) ( -960 -864 64 ) exx/floor-clang01 0 0 -90 0.25 -0.25 0 0 0 +( -960 -912 64 ) ( -1072 -864 64 ) ( -960 -864 64 ) exx/trim-psimple05 128 0 90 0.125 0.125 0 0 0 ( -896 -744 32 ) ( -912 -744 32 ) ( -912 -960 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 -( -928 -896 64 ) ( -928 -896 -32 ) ( -1056 -896 -32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -1024 -864 -32 ) ( -1024 -864 64 ) ( -1056 -896 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -928 -896 -32 ) ( -928 -896 64 ) ( -960 -864 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -976 -844 64 ) ( -1008 -844 32 ) ( -976 -844 32 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -984 -848 -64 ) ( -992 -848 -64 ) ( -984 -848 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -928 -928 64 ) ( -960 -736 64 ) ( -928 -736 64 ) exx/trim-psimple05 128 0 0 0.125 0.125 0 0 0 +( -960 280 32 ) ( -944 280 32 ) ( -960 408 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -960 -800 64 ) ( -960 -800 32 ) ( -928 -768 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 +( -960 -864 32 ) ( -960 -864 64 ) ( -928 -896 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 +( -980 -816 64 ) ( -980 -848 32 ) ( -980 -816 32 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -976 -824 -64 ) ( -976 -832 -64 ) ( -976 -824 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { ( -928 -928 64 ) ( -960 -736 64 ) ( -928 -736 64 ) exx/floor-clang01 0 0 -90 0.25 -0.25 0 0 0 @@ -22677,7 +22701,15 @@ exx/base-metal03 ( -960 280 32 ) ( -944 280 32 ) ( -960 408 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 ( -960 -800 64 ) ( -960 -800 32 ) ( -928 -768 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 ( -960 -864 32 ) ( -960 -864 64 ) ( -928 -896 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 -( -980 -816 64 ) ( -980 -848 32 ) ( -980 -816 32 ) common/caulk 0 0 -90 0.25 -0.25 0 0 0 +( -976 -824 64 ) ( -976 -832 -64 ) ( -976 -824 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -960 -912 64 ) ( -1072 -864 64 ) ( -960 -864 64 ) exx/floor-clang01 0 0 -90 0.25 -0.25 0 0 0 +( -896 -744 32 ) ( -912 -744 32 ) ( -912 -960 32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -928 -896 64 ) ( -928 -896 -32 ) ( -1056 -896 -32 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -1024 -864 -32 ) ( -1024 -864 64 ) ( -1056 -896 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -928 -896 -32 ) ( -928 -896 64 ) ( -960 -864 64 ) common/caulk 0 0 -90 0.25 -0.25 0 4 0 +( -984 -848 64 ) ( -992 -848 -64 ) ( -984 -848 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } } { diff --git a/maps/stormkeep.map.options b/maps/stormkeep.map.options index 646fd1b2..dd62651e 100644 --- a/maps/stormkeep.map.options +++ b/maps/stormkeep.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 11b +Version: 11c