Merge branch 'matthiaskrgr/srgb' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir...

diff --git a/maps/drain.map b/maps/drain.map
index 0d3c087aed1ce197a15721d1acb6441c90ac1724..1c842fdef1981fe18ca9e9b2fd60dadd01057806 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -2109,7 +2109,7 @@
 ( 288 512 384 ) ( -544 512 384 ) ( 288 512 352 ) common/hintskip 0 0 0 0.2499999702 0.25 0 0 0
 ( 480 544 384 ) ( 480 544 352 ) ( 480 32 384 ) common/hintskip 512 0 0 0.2499999702 0.25 0 0 0
 ( -544 -32 352 ) ( 288 -32 352 ) ( -544 480 352 ) common/hint 0 0 0 0.2499999702 0.25 0 0 0
-( -864 -1312 352 ) ( -864 -1312 384 ) ( -32 -1312 352 ) common/hintskip 512.0004882812 0 0 0.2499999702 0.25 0 0 0
+( -864 -1312 352 ) ( -864 -1312 384 ) ( -32 -1312 352 ) common/hintskip 512.0004882813 0 0 0.2499999702 0.25 0 0 0
 ( -1056 -288 352 ) ( -1056 224 352 ) ( -1056 -288 384 ) common/hintskip 255.9999847412 0 0 0.2499999702 0.25 0 0 0
 }
 {
@@ -3003,26 +3003,26 @@
 ( -384 -144 128 ) ( -384 -96 128 ) ( -384 -144 384 ) common/clip 64 0 0 0.25 0.25 0 0 0
 }
 {
-( -168 -480 -84 ) ( -148 -480 -74 ) ( -181 -480 -55 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -168 -480 -84 ) ( -148 -480 -74 ) ( -181 -480 -55 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -168 -480 -84 ) ( -148 -672 -74 ) ( -148 -480 -74 ) phillipk1x/roof-pk01_roof01 0 0 -90 0.25 0.25 0 0 0
-( -164 -672 -46 ) ( -148 -672 -74 ) ( -181 -672 -55 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -164 -672 -46 ) ( -148 -672 -74 ) ( -181 -672 -55 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -181 -672 -55 ) ( -168 -672 -84 ) ( -168 -480 -84 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -164 -480 -46 ) ( -148 -480 -74 ) ( -148 -672 -74 ) phillipk1x/trim-pk01_trims01b 128 218.1849060059 0 -0.25 0.2559015453 0 0 0
 ( -181 -480 -55 ) ( -164 -672 -46 ) ( -181 -672 -55 ) common/caulk 128 59.4708251953 -90 0.25 0.2559015453 0 0 0
 }
 {
-( -164 -512 -46 ) ( -148 -512 -74 ) ( -121 -512 -24 ) common/clip 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -164 -512 -46 ) ( -148 -512 -74 ) ( -121 -512 -24 ) common/clip 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -106 -544 -53 ) ( -148 -512 -74 ) ( -148 -544 -74 ) common/clip 0 59.4708251953 -90 0.25 0.2559015453 0 0 0
 ( -106 -544 -53 ) ( -121 -512 -24 ) ( -106 -512 -53 ) common/clip 0 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -164 -544 -46 ) ( -148 -544 -74 ) ( -148 -512 -74 ) common/clip 0 113.1826782227 0 -0.25 0.2559015453 0 0 0
-( -121 -640 -24 ) ( -148 -640 -74 ) ( -164 -640 -46 ) common/clip 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -121 -640 -24 ) ( -148 -640 -74 ) ( -164 -640 -46 ) common/clip 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -164 -544 -46 ) ( -121 -512 -24 ) ( -121 -544 -24 ) common/clip 0 59.4708251953 -90 0.25 0.2559015453 0 0 0
 }
 {
-( -106 -480 -17 ) ( -121 -480 -24 ) ( -92 -480 -46 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -106 -480 -17 ) ( -121 -480 -24 ) ( -92 -480 -46 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -92 -672 -46 ) ( -106 -480 -17 ) ( -92 -480 -46 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -92 -672 -46 ) ( -106 -480 -53 ) ( -106 -672 -53 ) phillipk1x/roof-pk01_roof01 0 0 -90 0.25 0.25 0 0 0
-( -106 -672 -17 ) ( -106 -672 -53 ) ( -121 -672 -24 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -106 -672 -17 ) ( -106 -672 -53 ) ( -121 -672 -24 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -106 -480 -53 ) ( -121 -672 -24 ) ( -106 -672 -53 ) phillipk1x/trim-pk01_trims01b 128 302.1849060059 0 -0.25 0.2559015453 0 0 0
 ( -121 -480 -24 ) ( -106 -672 -17 ) ( -121 -672 -24 ) common/caulk 128 59.4708251953 -90 0.25 0.2559015453 0 0 0
 }
@@ -3030,20 +3030,20 @@
 ( -156 -640 -60 ) ( -113 -640 -39 ) ( -113 -512 -39 ) phillipk1x/trim-pk01_trims01a 128 59.4708251953 -90 0.25 0.2559015453 0 0 0
 ( -121 -512 -24 ) ( -113 -512 -39 ) ( -113 -640 -39 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -164 -640 -46 ) ( -156 -512 -60 ) ( -164 -512 -46 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
-( -164 -512 -46 ) ( -113 -512 -39 ) ( -121 -512 -24 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
-( -164 -640 -46 ) ( -113 -640 -39 ) ( -156 -640 -60 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -164 -512 -46 ) ( -113 -512 -39 ) ( -121 -512 -24 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -164 -640 -46 ) ( -113 -640 -39 ) ( -156 -640 -60 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -121 -512 -24 ) ( -164 -640 -46 ) ( -164 -512 -46 ) common/caulk 128 59.4708251953 -90 0.25 0.2559015453 0 0 0
 }
 {
 ( -106 -672 -53 ) ( -148 -640 -74 ) ( -148 -672 -74 ) phillipk1x/roof-pk01_roof01 128 192 0 0.25 0.25 0 0 0
-( -121 -672 -24 ) ( -148 -672 -74 ) ( -164 -672 -46 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -121 -672 -24 ) ( -148 -672 -74 ) ( -164 -672 -46 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -121 -640 -24 ) ( -106 -672 -53 ) ( -121 -672 -24 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -164 -640 -46 ) ( -148 -672 -74 ) ( -148 -640 -74 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -164 -640 -46 ) ( -148 -640 -74 ) ( -121 -640 -24 ) phillipk1x/trim-pk01_trims01b 154.3372802734 4.9730834961 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -164 -672 -46 ) ( -121 -640 -24 ) ( -121 -672 -24 ) common/caulk 128 59.4708251953 -90 0.25 0.2559015453 0 0 0
 }
 {
-( -164 -480 -46 ) ( -148 -480 -74 ) ( -121 -480 -24 ) common/caulk 154.3372802734 4.9731445312 26.9999980927 0.2499999702 0.2499999702 0 0 0
+( -164 -480 -46 ) ( -148 -480 -74 ) ( -121 -480 -24 ) common/caulk 154.3372802734 4.9731445313 26.9999980927 0.2499999702 0.2499999702 0 0 0
 ( -106 -512 -53 ) ( -148 -480 -74 ) ( -148 -512 -74 ) phillipk1x/roof-pk01_roof01 128 192 0 0.25 0.25 0 0 0
 ( -106 -512 -53 ) ( -121 -480 -24 ) ( -106 -480 -53 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
 ( -164 -512 -46 ) ( -148 -512 -74 ) ( -148 -480 -74 ) common/caulk 128 113.1826782227 0 -0.25 0.2559015453 0 0 0
@@ -5285,7 +5285,7 @@
 ( 544 -932 0 ) ( 544 -964 -32 ) ( 544 -964 0 ) common/caulk 144 240 0 0.25 0.25 134217728 0 0
 ( 544 -932 -32 ) ( 536 -964 -32 ) ( 544 -964 -32 ) common/caulk 144 112 0 0.25 0.25 134217728 0 0
 ( 544 -960 -32 ) ( 536 -960 0 ) ( 544 -960 0 ) phillipk1x/roof-pk01_roof01 384 240 0 0.25 0.25 134217728 0 0
-( 542 -964 0 ) ( 542 -932 -32 ) ( 542 -932 0 ) screens/screen_airlock0 0.0180664062 341.3331604004 0 -0.0468750447 0.046875 134217728 0 0
+( 542 -964 0 ) ( 542 -932 -32 ) ( 542 -932 0 ) screens/screen_airlock0 0.0180664063 341.3331604004 0 -0.0468750447 0.046875 134217728 0 0
 }
 {
 ( 544 -936 -32 ) ( 544 -960 -32 ) ( 540 -936 -32 ) common/caulk 128 112 0 0.25 0.25 134217728 0 0
@@ -5389,7 +5389,7 @@
 ( -256 -832 -188 ) ( -256 -864 -220 ) ( -256 -864 -188 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -256 -832 -220 ) ( -264 -864 -220 ) ( -256 -864 -220 ) common/caulk 16 0 0 0.25 0.25 134217728 0 0
 ( -256 -860 -220 ) ( -264 -860 -188 ) ( -256 -860 -188 ) phillipk1x/roof-pk01_roof01 0 0 0 0.25 0.25 134217728 0 0
-( -258 -864 -188 ) ( -258 -832 -220 ) ( -258 -832 -188 ) screens/screen_door0 85.349609375 426.6665039062 0 -0.0468750447 0.046875 134217728 0 0
+( -258 -864 -188 ) ( -258 -832 -220 ) ( -258 -832 -188 ) screens/screen_door0 85.349609375 426.6665039063 0 -0.0468750447 0.046875 134217728 0 0
 }
 {
 ( -64 -132 -220 ) ( -64 -156 -220 ) ( -68 -132 -220 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -5417,7 +5417,7 @@
 ( -64 -128 -188 ) ( -64 -160 -220 ) ( -64 -160 -188 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -64 -128 -220 ) ( -72 -160 -220 ) ( -64 -160 -220 ) common/caulk 16 0 0 0.25 0.25 134217728 0 0
 ( -64 -156 -220 ) ( -72 -156 -188 ) ( -64 -156 -188 ) phillipk1x/roof-pk01_roof01 256 0 0 0.25 0.25 134217728 0 0
-( -66 -160 -188 ) ( -66 -128 -220 ) ( -66 -128 -188 ) screens/screen_toggle0 256.001953125 426.6665039062 0 -0.0468750447 0.046875 134217728 0 0
+( -66 -160 -188 ) ( -66 -128 -220 ) ( -66 -128 -188 ) screens/screen_toggle0 256.001953125 426.6665039063 0 -0.0468750447 0.046875 134217728 0 0
 }
 {
 ( -576 -932 -220 ) ( -576 -956 -220 ) ( -580 -932 -220 ) common/caulk 0 128 0 0.25 0.25 134217728 0 0
@@ -5445,7 +5445,7 @@
 ( -576 -928 -188 ) ( -576 -960 -220 ) ( -576 -960 -188 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
 ( -576 -928 -220 ) ( -584 -960 -220 ) ( -576 -960 -220 ) common/caulk 16 128 0 0.25 0.25 134217728 0 0
 ( -576 -956 -220 ) ( -584 -956 -188 ) ( -576 -956 -188 ) phillipk1x/roof-pk01_roof01 256 0 0 0.25 0.25 134217728 0 0
-( -578 -960 -188 ) ( -578 -928 -220 ) ( -578 -928 -188 ) screens/screen_door1 85.3515625 426.6665039062 0 -0.0468750447 0.046875 134217728 0 0
+( -578 -960 -188 ) ( -578 -928 -220 ) ( -578 -928 -188 ) screens/screen_door1 85.3515625 426.6665039063 0 -0.0468750447 0.046875 134217728 0 0
 }
 {
 ( -956 -768 -220 ) ( -932 -768 -220 ) ( -956 -772 -220 ) common/caulk 0 0 90 0.25 0.25 134217728 0 0
@@ -5473,7 +5473,7 @@
 ( -960 -768 -188 ) ( -928 -768 -220 ) ( -928 -768 -188 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
 ( -960 -768 -220 ) ( -928 -776 -220 ) ( -928 -768 -220 ) common/caulk 16 0 90 0.25 0.25 134217728 0 0
 ( -932 -768 -220 ) ( -932 -776 -188 ) ( -932 -768 -188 ) phillipk1x/roof-pk01_roof01 0 0 0 0.25 0.25 134217728 0 0
-( -928 -770 -188 ) ( -960 -770 -220 ) ( -960 -770 -188 ) screens/screen_door1 426.646484375 426.6665039062 0 0.0468750447 0.046875 134217728 0 0
+( -928 -770 -188 ) ( -960 -770 -220 ) ( -960 -770 -188 ) screens/screen_door1 426.646484375 426.6665039063 0 0.0468750447 0.046875 134217728 0 0
 }
 {
 ( -380 576 36 ) ( -356 576 36 ) ( -380 572 36 ) common/caulk 0 0 90 0.25 0.25 134217728 0 0
@@ -6639,7 +6639,7 @@
 ( 352 896 640 ) ( -480 896 640 ) ( 352 896 608 ) skies/heaven 511.9999694824 0 0 0.2499999702 0.25 0 0 0
 ( 640 576 640 ) ( 640 576 608 ) ( 640 64 640 ) skies/heaven 384 0 0 0.2499999702 0.25 0 0 0
 ( -544 -32 608 ) ( 288 -32 608 ) ( -544 480 608 ) skies/heaven 0 0 0 0.2499999851 0.25 0 0 0
-( -864 -1280 608 ) ( -864 -1280 640 ) ( -32 -1280 608 ) skies/heaven 512.0004882812 0 0 0.2499999702 0.25 0 0 0
+( -864 -1280 608 ) ( -864 -1280 640 ) ( -32 -1280 608 ) skies/heaven 512.0004882813 0 0 0.2499999702 0.25 0 0 0
 ( -1024 -256 608 ) ( -1024 256 608 ) ( -1024 -256 640 ) skies/heaven 127.9999694824 0 0 0.2499999702 0.25 0 0 0
 }
 {
@@ -6647,7 +6647,7 @@
 ( 288 512 384 ) ( -544 512 384 ) ( 288 512 352 ) common/clip 0 0 0 0.2499999702 0.25 0 0 0
 ( 480 544 384 ) ( 480 544 352 ) ( 480 32 384 ) common/clip 512 0 0 0.2499999702 0.25 0 0 0
 ( -544 -32 352 ) ( 288 -32 352 ) ( -544 480 352 ) common/clip 0 0 0 0.2499999702 0.25 0 0 0
-( -864 -1312 352 ) ( -864 -1312 384 ) ( -32 -1312 352 ) common/clip 512.0004882812 0 0 0.2499999702 0.25 0 0 0
+( -864 -1312 352 ) ( -864 -1312 384 ) ( -32 -1312 352 ) common/clip 512.0004882813 0 0 0.2499999702 0.25 0 0 0
 ( -1056 -288 352 ) ( -1056 224 352 ) ( -1056 -288 384 ) common/clip 255.9999847412 0 0 0.2499999702 0.25 0 0 0
 }
 {
@@ -9277,7 +9277,7 @@ trak5x/base-pipe1d
 ( -250 -992 -128 ) ( -250 -864 -96 ) ( -250 -992 -96 ) phillipk1x/trim-pk01_thin_wall01a 0 128 90 0.25 -0.25 0 0 0
 ( -250 -864 -128 ) ( -192 -864 -96 ) ( -250 -864 -96 ) phillipk1x/walls-pk01_wall03a 320 0 0 -0.25 0.25 0 0 0
 ( -224 -864 -128 ) ( -224 -992 -96 ) ( -224 -864 -96 ) phillipk1x/walls-pk01_wall03a 256 0 0 -0.25 0.25 0 0 0
-( -192 -864 -128 ) ( -250 -864 -128 ) ( -250 -992 -128 ) phillipk1x/trim-pk01_thin_wall02a 49.2309570312 384 180 0.2031250149 0.25 0 0 0
+( -192 -864 -128 ) ( -250 -864 -128 ) ( -250 -992 -128 ) phillipk1x/trim-pk01_thin_wall02a 49.2309570313 384 180 0.2031250149 0.25 0 0 0
 ( -192 -864 -96 ) ( -250 -992 -96 ) ( -250 -864 -96 ) common/caulk 64 0 180 0.25 0.25 0 0 0
 ( -192 -992 -128 ) ( -250 -992 -96 ) ( -192 -992 -96 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 }
@@ -9772,7 +9772,7 @@ trak5x/base-pipe1d
 ( -570 -960 -96 ) ( -570 -1088 -96 ) ( -570 -960 -128 ) phillipk1x/trim-pk01_thin_wall01a 0 256 90 0.25 0.25 0 0 0
 ( -570 -1088 -96 ) ( -512 -1088 -96 ) ( -570 -1088 -128 ) phillipk1x/walls-pk01_wall03a 64 0 0 -0.25 0.25 0 0 0
 ( -532 -1088 -96 ) ( -532 -960 -96 ) ( -532 -1088 -128 ) phillipk1x/walls-pk01_wall03a 256 0 0 0.25 0.25 0 0 0
-( -570 -960 -128 ) ( -570 -1088 -128 ) ( -512 -1088 -128 ) phillipk1x/trim-pk01_thin_wall02a 37.6489257812 256 180 0.265625 0.25 0 0 0
+( -570 -960 -128 ) ( -570 -1088 -128 ) ( -512 -1088 -128 ) phillipk1x/trim-pk01_thin_wall02a 37.6489257813 256 180 0.265625 0.25 0 0 0
 ( -570 -1088 -96 ) ( -570 -960 -96 ) ( -512 -1088 -96 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 ( -512 -960 -96 ) ( -570 -960 -96 ) ( -512 -960 -128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 }
@@ -11798,7 +11798,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.866486 -230.319901 -251.142624"
+"origin" "-73.866486 -230.319901 -259.142639"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11823,7 +11823,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-592.000000 -1240.000000 -248.000000"
+"origin" "-592.000000 -1240.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11847,7 +11847,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-632.000000 -1240.000000 -248.000000"
+"origin" "-632.000000 -1240.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"

diff --git a/maps/drain.map.options b/maps/drain.map.options
index e2fb068845b7ff98fdd5bb83e3c72c1dddca0eb0..0598ba43a3b70a35b21308e4016a9b6c107054cf 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 13d
+Version: 13e
\ No newline at end of file

diff --git a/maps/oilrig.map b/maps/oilrig.map
index 9d67e6e021db95b93f107d0bf1d79f2870f8ee5f..d68140d42fb0c9d6edc027f29329088024ca100d 100644 (file)
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -24063,7 +24063,7 @@ exx/wall-bigrib02
 }
 {
 "classname" "misc_model"
-"origin" "640.099915 -88.000015 95.750000"
+"origin" "640.099915 -88.000015 95.625000"
 "model" "models/lights/xonlight02.md3"
 "angle" "89.999992"
 "modelscale" "0.700000"

diff --git a/maps/oilrig.map.options b/maps/oilrig.map.options
index 2721744040b8c0bffb40ecf40406184efc3f7fbb..c4e4b0e226b46c1a7edebe6df45fae785c5248d6 100644 (file)
--- a/maps/oilrig.map.options
+++ b/maps/oilrig.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6c
+Version: 6d
\ No newline at end of file