z-fights, some polishing. Should be ok.

diff --git a/maps/fuse.map b/maps/fuse.map
index 628db4bc36de917fdcfb56896359d4727ffe7c44..63539d3e783cf850527c7f04c66051eba88414d1 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -26574,16 +26574,6 @@ brushDef
 {
 brushDef
 {
 {
 brushDef
 {

-( 440 -832 160 ) ( 440 -880 160 ) ( 432 -832 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 440 -832 0 ) ( 432 -832 160 ) ( 432 -832 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 440 -880 0 ) ( 440 -832 0 ) ( 432 -832 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 440 -880 0 ) ( 432 -832 160 ) ( 440 -880 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 448 -856 0 ) ( 448 -904 160 ) ( 448 -856 160 ) ( ( 0.015625 0 0.375 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{

 ( -1344 -576 -384 ) ( -1664 -576 64 ) ( -1664 -576 -384 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1344 -832 -384 ) ( -1344 -576 64 ) ( -1344 -576 -384 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0.5 ) ) exx/wall-pipe 0 0 0
 ( -1344 -576 -384 ) ( -1664 -832 -384 ) ( -1344 -832 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1344 -576 -384 ) ( -1664 -576 64 ) ( -1664 -576 -384 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1344 -832 -384 ) ( -1344 -576 64 ) ( -1344 -576 -384 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0.5 ) ) exx/wall-pipe 0 0 0
 ( -1344 -576 -384 ) ( -1664 -832 -384 ) ( -1344 -832 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0


@@ -28339,6 +28329,18 @@ brushDef
 ( 216 -408 -64 ) ( 208 -432 -64 ) ( 216 -408 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
 ( 216 -408 -64 ) ( 208 -432 -64 ) ( 216 -408 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
 }

+{
+brushDef
+{
+( 448 -832 160 ) ( 448 -904 160 ) ( 416 -832 160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( 448 -808 160 ) ( 416 -808 160 ) ( 448 -808 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 512 -872 160 ) ( 512 -872 0 ) ( 512 -944 160 ) ( ( 0.015625 0 0.625 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 416 -904 0 ) ( 448 -904 0 ) ( 416 -832 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( 432 -904 0 ) ( 432 -832 0 ) ( 432 -904 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 448 -1032 -64 ) ( 440 -1024 -64 ) ( 448 -1032 64 ) ( ( 0.0156249991 0 255.911605835 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 432 -816 -64 ) ( 440 -808 -64 ) ( 432 -816 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+}
+}

 }
 {
 "classname" "func_group"
 }
 {
 "classname" "func_group"


@@ -31887,6 +31889,7 @@ brushDef
 ( -1144 78 -256 ) ( -1144 62 -192 ) ( -1144 78 -192 ) ( ( 0.015625 0 253 ) ( 0 0.015625 254 ) ) common/clip 134217728 0 0
 ( -1160 62 -256 ) ( -1168 62 -200 ) ( -1160 62 -192 ) ( ( 0 0.015625 1022 ) ( -0.015625 0 1008 ) ) common/clip 134217728 0 0
 ( -1168 132 -64 ) ( -1152 148 -64 ) ( -1168 132 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( -1144 78 -256 ) ( -1144 62 -192 ) ( -1144 78 -192 ) ( ( 0.015625 0 253 ) ( 0 0.015625 254 ) ) common/clip 134217728 0 0
 ( -1160 62 -256 ) ( -1168 62 -200 ) ( -1160 62 -192 ) ( ( 0 0.015625 1022 ) ( -0.015625 0 1008 ) ) common/clip 134217728 0 0
 ( -1168 132 -64 ) ( -1152 148 -64 ) ( -1168 132 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0

+( -1144 64 -64 ) ( -1152 62 -64 ) ( -1144 64 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 134217728 0 0

 }
 }
 {
 }
 }
 {


@@ -33860,8 +33863,8 @@ brushDef
 ( 432 -782 56 ) ( 432 -782 0 ) ( 432 -766 56 ) ( ( 0.03125 0 40.0625 ) ( 0 0.0357137322 2 ) ) common/clip 134217728 0 0
 ( 440 -792 64 ) ( 440 -792 0 ) ( 432 -782 0 ) ( ( 0 0.015625 2 ) ( -0.015625 0 1.375 ) ) common/clip 134217728 0 0
 ( 440 -782 0 ) ( 440 -766 0 ) ( 432 -782 0 ) ( ( 0 -0.015625 254 ) ( 0.015625 0 14 ) ) common/clip 134217728 0 0
 ( 432 -782 56 ) ( 432 -782 0 ) ( 432 -766 56 ) ( ( 0.03125 0 40.0625 ) ( 0 0.0357137322 2 ) ) common/clip 134217728 0 0
 ( 440 -792 64 ) ( 440 -792 0 ) ( 432 -782 0 ) ( ( 0 0.015625 2 ) ( -0.015625 0 1.375 ) ) common/clip 134217728 0 0
 ( 440 -782 0 ) ( 440 -766 0 ) ( 432 -782 0 ) ( ( 0 -0.015625 254 ) ( 0.015625 0 14 ) ) common/clip 134217728 0 0

-( 440 -792 0 ) ( 440 -792 64 ) ( 440 -766 64 ) ( ( 0.015625 0 14 ) ( 0 0.015625 2 ) ) common/clip 134217728 0 0
-( 440 -766 64 ) ( 432 -766 56 ) ( 440 -766 0 ) ( ( 0 0.015625 2 ) ( -0.015625 0 1021.375 ) ) common/clip 134217728 0 0
+( 448 -790 0 ) ( 448 -790 64 ) ( 448 -764 64 ) ( ( 0.015625 0 13.96875 ) ( 0 0.015625 2 ) ) common/clip 134217728 0 0
+( 432 -766 -64 ) ( 440 -750 -64 ) ( 432 -766 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 134217728 0 0

 }
 }
 {
 }
 }
 {


@@ -35773,7 +35776,7 @@ brushDef
 ( -1280.5979766846 -1151.0294342041 -176 ) ( -1229.6862945557 -1201.941116333 -176 ) ( -1280.5979766846 -1151.0294342041 -288 ) ( ( 0.0138888834 0 1.2724552155 ) ( 0 0.0357142016 248.5714569092 ) ) common/caulk 134217728 0 0
 ( -1280.5979766846 -1151.0294342041 -176 ) ( -1280.5979766846 -1151.0294342041 -288 ) ( -1257.9705657959 -1128.4020080566 -176 ) ( ( 0.0312500037 0 203.2680969238 ) ( 0 0.0357140116 248.5715026855 ) ) exx/floor-simple05 134217728 0 0
 ( -1207.0588684082 -1179.3136901855 -264 ) ( -1257.9705657959 -1128.4020080566 -264 ) ( -1229.6862945557 -1201.941116333 -264 ) ( ( -0.0220970865 0.0220970865 203.2681121826 ) ( -0.0196418557 -0.0196418557 2.5449714661 ) ) exx/floor-simple05 134217728 0 0
 ( -1280.5979766846 -1151.0294342041 -176 ) ( -1229.6862945557 -1201.941116333 -176 ) ( -1280.5979766846 -1151.0294342041 -288 ) ( ( 0.0138888834 0 1.2724552155 ) ( 0 0.0357142016 248.5714569092 ) ) common/caulk 134217728 0 0
 ( -1280.5979766846 -1151.0294342041 -176 ) ( -1280.5979766846 -1151.0294342041 -288 ) ( -1257.9705657959 -1128.4020080566 -176 ) ( ( 0.0312500037 0 203.2680969238 ) ( 0 0.0357140116 248.5715026855 ) ) exx/floor-simple05 134217728 0 0
 ( -1207.0588684082 -1179.3136901855 -264 ) ( -1257.9705657959 -1128.4020080566 -264 ) ( -1229.6862945557 -1201.941116333 -264 ) ( ( -0.0220970865 0.0220970865 203.2681121826 ) ( -0.0196418557 -0.0196418557 2.5449714661 ) ) exx/floor-simple05 134217728 0 0

-( -1207.0588684082 -1179.3136901855 -288 ) ( -1207.0588684082 -1179.3136901855 -176 ) ( -1257.9705657959 -1128.4020080566 -288 ) ( ( 0.0138888834 0 255.7274932861 ) ( 0 0.0357139967 248.5715026855 ) ) common/caulk 134217728 0 0
+( -1207.0588684082 -1179.3136901855 -288 ) ( -1207.0588684082 -1179.3136901855 -176 ) ( -1257.9705657959 -1128.4020080566 -288 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0

 ( -1207.0588684082 -1179.3136901855 -288 ) ( -1229.6862945557 -1201.941116333 -288 ) ( -1207.0588684082 -1179.3136901855 -176 ) ( ( 0.0312500037 0 53.7318992615 ) ( 0 0.0357140116 248.5715026855 ) ) exx/floor-simple05 134217728 0 0
 }
 }
 ( -1207.0588684082 -1179.3136901855 -288 ) ( -1229.6862945557 -1201.941116333 -288 ) ( -1207.0588684082 -1179.3136901855 -176 ) ( ( 0.0312500037 0 53.7318992615 ) ( 0 0.0357140116 248.5715026855 ) ) exx/floor-simple05 134217728 0 0
 }
 }


@@ -35993,7 +35996,7 @@ brushDef
 ( -1311.7106781006 -1074.661895752 -184 ) ( -1303.2253875732 -1083.1471710205 -184 ) ( -1311.7106781006 -1074.661895752 -280 ) ( ( 0.0078124972 0 124.4032821655 ) ( 0 0.0078125 0.625 ) ) exx/base-metal01 134217728 0 0
 ( -1314.5390930176 -1071.8334655762 -184 ) ( -1314.5390930176 -1071.8334655762 -280 ) ( -1311.7106781006 -1069.0050354004 -184 ) ( ( 0.0156250019 0 235.1340484619 ) ( 0 0.015625 1.25 ) ) common/caulk 134217728 0 0
 ( -1300.3969573975 -1080.3187561035 -288 ) ( -1308.8822479248 -1071.8334655762 -288 ) ( -1303.2253875732 -1083.1471710205 -288 ) ( ( -0.0110485433 0.0110485433 235.1340637207 ) ( -0.0110485433 -0.0110485433 248.8065490723 ) ) common/caulk 134217728 0 0
 ( -1311.7106781006 -1074.661895752 -184 ) ( -1303.2253875732 -1083.1471710205 -184 ) ( -1311.7106781006 -1074.661895752 -280 ) ( ( 0.0078124972 0 124.4032821655 ) ( 0 0.0078125 0.625 ) ) exx/base-metal01 134217728 0 0
 ( -1314.5390930176 -1071.8334655762 -184 ) ( -1314.5390930176 -1071.8334655762 -280 ) ( -1311.7106781006 -1069.0050354004 -184 ) ( ( 0.0156250019 0 235.1340484619 ) ( 0 0.015625 1.25 ) ) common/caulk 134217728 0 0
 ( -1300.3969573975 -1080.3187561035 -288 ) ( -1308.8822479248 -1071.8334655762 -288 ) ( -1303.2253875732 -1083.1471710205 -288 ) ( ( -0.0110485433 0.0110485433 235.1340637207 ) ( -0.0110485433 -0.0110485433 248.8065490723 ) ) common/caulk 134217728 0 0

-( -1297.5685424805 -1083.1471710205 -280 ) ( -1297.5685424805 -1083.1471710205 -184 ) ( -1306.053817749 -1074.661895752 -280 ) ( ( 0.0041666655 0 0.2849217951 ) ( 0 0.0089285718 510.4285583496 ) ) ct_fuse/ad_xonotic 134217728 0 0
+( -1297.5685424805 -1083.1471710205 -280 ) ( -1297.5685424805 -1083.1471710205 -184 ) ( -1306.053817749 -1074.661895752 -280 ) ( ( 0.0010416664 0 0.0712304488 ) ( 0 0.002232143 127.6071395874 ) ) common/caulk 134217728 0 0

 ( -1142.0050506592 -1238.7106628418 -272 ) ( -1144.833480835 -1241.5390930176 -272 ) ( -1142.0050506592 -1238.7106628418 -176 ) ( ( 0.0156250019 0 20.8659648895 ) ( 0 0.015625 1.25 ) ) common/caulk 134217728 0 0
 }
 }
 ( -1142.0050506592 -1238.7106628418 -272 ) ( -1144.833480835 -1241.5390930176 -272 ) ( -1142.0050506592 -1238.7106628418 -176 ) ( ( 0.0156250019 0 20.8659648895 ) ( 0 0.015625 1.25 ) ) common/caulk 134217728 0 0
 }
 }


@@ -36474,12 +36477,12 @@ brushDef
 {
 brushDef
 {
 {
 brushDef
 {

-( 520 352 -392 ) ( 520 376 -392 ) ( 544 352 -392 ) ( ( 0.0416666679 0 497.6666564941 ) ( 0 0.0416664407 490.3334655762 ) ) exx/wall-bplate06 134217728 0 0
-( 544 376 -392 ) ( 520 376 -392 ) ( 544 368 -440 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.875 ) ) common/caulk 134217728 0 0
-( 544 352 -392 ) ( 544 376 -392 ) ( 544 344 -440 ) ( ( -0.0032870783 0.0186419468 249.9282989502 ) ( -0.040876925 -0.0072077047 18.2140979767 ) ) exx/trim-simple01 134217728 0 0
-( 520 344 -440 ) ( 544 344 -440 ) ( 520 368 -440 ) ( ( 0.0416666679 0 497.6666564941 ) ( 0 0.0416666679 22.6666679382 ) ) exx/wall-bplate06 134217728 0 0
-( 520 352 -392 ) ( 544 352 -392 ) ( 544 344 -440 ) ( ( 0 0.0205498729 249.2432403564 ) ( -0.0416666679 0 22.6666679382 ) ) exx/trim-simple01 134217728 0 0
-( 520 376 -392 ) ( 520 352 -392 ) ( 520 368 -440 ) ( ( 0.0018288423 0.019614106 248.998916626 ) ( -0.0380038582 0.0045025693 112.9455413818 ) ) exx/trim-simple01 134217728 0 0
+( 520 344 -392 ) ( 520 368 -392 ) ( 544 344 -392 ) ( ( 0.0416666679 0 498 ) ( 0 0.0416664407 490.3334655762 ) ) exx/wall-bplate06 134217728 0 0
+( 544 368 -392 ) ( 520 368 -392 ) ( 544 360 -440 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.8544464111 ) ) common/caulk 134217728 0 0
+( 544 344 -392 ) ( 544 368 -392 ) ( 544 336 -440 ) ( ( -0.0032870783 0.0186419468 249.9020080566 ) ( -0.040876925 -0.0072077047 17.8870830536 ) ) exx/trim-simple01 134217728 0 0
+( 520 336 -440 ) ( 544 336 -440 ) ( 520 360 -440 ) ( ( 0.0416666679 0 498 ) ( 0 0.0416666679 22.6666679382 ) ) exx/wall-bplate06 134217728 0 0
+( 520 344 -392 ) ( 544 344 -392 ) ( 544 336 -440 ) ( ( 0 0.0205498729 249.216217041 ) ( -0.0416666679 0 22.6666679382 ) ) exx/trim-simple01 134217728 0 0
+( 520 368 -392 ) ( 520 344 -392 ) ( 520 360 -440 ) ( ( 0.0018288423 0.019614106 248.9842834473 ) ( -0.0380038582 0.0045025693 113.2495727539 ) ) exx/trim-simple01 134217728 0 0

 }
 }
 {
 }
 }
 {


@@ -36892,10 +36895,10 @@ exx/wall-metal01c
 brushDef
 {
 ( 628 352 -256 ) ( 628 348 -256 ) ( 616 352 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 brushDef
 {
 ( 628 352 -256 ) ( 628 348 -256 ) ( 616 352 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0

-( 628 352 -264 ) ( 616 352 -264 ) ( 628 352 -360 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 628 352 -264 ) ( 616 352 -264 ) ( 628 352 -360 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0

 ( 632 352 -264 ) ( 632 352 -360 ) ( 632 348 -264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 616 348 -368 ) ( 628 348 -368 ) ( 616 352 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 632 352 -264 ) ( 632 352 -360 ) ( 632 348 -264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 616 348 -368 ) ( 628 348 -368 ) ( 616 352 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0

-( 612 348 -360 ) ( 612 348 -264 ) ( 624 348 -360 ) ( ( 0.0041666669 0 1022.3666381836 ) ( 0 0.0089285718 509.7142944336 ) ) ct_fuse/ad_xonotic 134217728 0 0
+( 612 348 -360 ) ( 612 348 -264 ) ( 624 348 -360 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0

 ( 392 348 -352 ) ( 392 352 -352 ) ( 392 348 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 ( 392 348 -352 ) ( 392 352 -352 ) ( 392 348 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }


@@ -37459,7 +37462,7 @@ brushDef
 ( -372 -648 -216 ) ( -360 -648 -216 ) ( -372 -648 -312 ) ( ( 0.0078125 0 126 ) ( 0 0.0078125 0.375 ) ) exx/base-metal01 134217728 0 0
 ( -376 -648 -216 ) ( -376 -648 -312 ) ( -376 -644 -216 ) ( ( 0.015625 0 251.375 ) ( 0 0.015625 0.75 ) ) common/caulk 134217728 0 0
 ( -360 -644 -320 ) ( -372 -644 -320 ) ( -360 -648 -320 ) ( ( -0.015625 0 251.375 ) ( 0 -0.015625 252 ) ) common/caulk 134217728 0 0
 ( -372 -648 -216 ) ( -360 -648 -216 ) ( -372 -648 -312 ) ( ( 0.0078125 0 126 ) ( 0 0.0078125 0.375 ) ) exx/base-metal01 134217728 0 0
 ( -376 -648 -216 ) ( -376 -648 -312 ) ( -376 -644 -216 ) ( ( 0.015625 0 251.375 ) ( 0 0.015625 0.75 ) ) common/caulk 134217728 0 0
 ( -360 -644 -320 ) ( -372 -644 -320 ) ( -360 -648 -320 ) ( ( -0.015625 0 251.375 ) ( 0 -0.015625 252 ) ) common/caulk 134217728 0 0

-( -356 -644 -312 ) ( -356 -644 -216 ) ( -368 -644 -312 ) ( ( 0.0041666669 0 1023.4333496094 ) ( 0 0.0089285718 510.1428527832 ) ) ct_fuse/ad_xonotic 134217728 0 0
+( -356 -644 -312 ) ( -356 -644 -216 ) ( -368 -644 -312 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0

 ( -136 -644 -304 ) ( -136 -648 -304 ) ( -136 -644 -208 ) ( ( 0.015625 0 4.625 ) ( 0 0.015625 0.75 ) ) common/caulk 134217728 0 0
 }
 }
 ( -136 -644 -304 ) ( -136 -648 -304 ) ( -136 -644 -208 ) ( ( 0.015625 0 4.625 ) ( 0 0.015625 0.75 ) ) common/caulk 134217728 0 0
 }
 }

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index d2d67a9659e3961de113d1dac50f49c8f4044183..7e86484ca9c750e5bfc83dc40f9a508c3db7d08e 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
 -vis +
 -minimap +
 -sRGB

-Version: 6
+Version: 7