Merge branch 'Spike29/fuse' into 'master'

Fix a z-fight on the column behind the Big armor, fixes #188

Closes #188

See merge request xonotic/xonotic-maps.pk3dir!152

diff --git a/maps/fuse.map b/maps/fuse.map
index bca84fe15c2a5cdf606f2fbfd802a17dc2c8e69c..75bbcb07b27970101c2effabf7087497be6fed60 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -8527,7 +8527,7 @@ brushDef
 brushDef
 {
 ( 656 -192 -56 ) ( 640 -192 -56 ) ( 640 -176 -56 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/caulk 134217728 0 0
-( 656 -176 -56 ) ( 640 -176 -56 ) ( 672 -176 -448 ) ( ( 0.03125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-metalsupp01 134217728 0 0
+( 656 -176 -56 ) ( 640 -176 -56 ) ( 672 -176 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 656 -192 -56 ) ( 656 -176 -56 ) ( 672 -192 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 656 -192 -448 ) ( 672 -192 -448 ) ( 656 -184 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 640 -192 -56 ) ( 656 -192 -56 ) ( 672 -192 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
@@ -28672,6 +28672,26 @@ exx/base-metal01
 )
 }
 }
+{
+brushDef
+{
+( -1304 -592 -136 ) ( -1272 -592 -136 ) ( -1304 -592 -168 ) ( ( -0.00390625 0 1014 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
+( -1272 -576 -168 ) ( -1272 -576 -136 ) ( -1304 -576 -168 ) ( ( -0.00390625 0 10 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
+( -1152 -592 -64 ) ( -1152 -600 -64 ) ( -1152 -592 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1168 -64 -128 ) ( -1172 64 -128 ) ( -1168 64 -128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1176 64 -132 ) ( -1180 64 -128 ) ( -1176 -64 -132 ) ( ( 0.0124999993 -0 -0.1999804676 ) ( 0 0.0252536982 0.7856216431 ) ) exx/panel-metal04 0 0 0
+}
+}
+{
+brushDef
+{
+( -1304 -592 -136 ) ( -1272 -592 -136 ) ( -1304 -592 -168 ) ( ( -0.00390625 0 1014 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
+( -1272 -576 -168 ) ( -1272 -576 -136 ) ( -1304 -576 -168 ) ( ( -0.00390625 0 10 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
+( -1316 64 -128 ) ( -1344 64 -156 ) ( -1316 -64 -128 ) ( ( 0.0124999993 -0 -0.0000195312 ) ( 0 0.0252536982 0.2144622803 ) ) exx/panel-metal04 0 0 0
+( -1316 64 -128 ) ( -1312 64 -128 ) ( -1316 -64 -128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1344 -64 -128 ) ( -1344 64 -136 ) ( -1344 64 -128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
 }
 {
 "classname" "func_group"
@@ -31769,26 +31789,6 @@ brushDef
 {
 brushDef
 {
-( -1320 -768 -128 ) ( -1344 -768 -128 ) ( -1320 -576 -128 ) ( ( 0 0.015625 23 ) ( -0.015625 0 245 ) ) common/caulk 134217728 0 0
-( -1320 -832 -128 ) ( -1320 -832 -160 ) ( -1344 -832 -128 ) ( ( 0 0.0078125 11.5 ) ( -0.0078125 0 510 ) ) exx/wall-metalrib01 134217728 0 0
-( -1344 -576 -160 ) ( -1344 -576 -128 ) ( -1344 -768 -160 ) ( ( 0.015625 0 245 ) ( 0 0.015625 252 ) ) common/caulk 134217728 0 0
-( -1344 -576 -160 ) ( -1320 -576 -160 ) ( -1344 -576 -128 ) ( ( 0.00390625 0 0 ) ( 0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( -1316 -688 -128 ) ( -1344 -688 -156 ) ( -1316 -816 -128 ) ( ( 0.0124999993 0 10.9999876022 ) ( 0 0.0252536982 222.2144622803 ) ) exx/panel-metal04 134217728 0 0
-}
-}
-{
-brushDef
-{
-( -1176 -576 -128 ) ( -1152 -768 -128 ) ( -1176 -768 -128 ) ( ( 0 0.015625 23 ) ( -0.015625 0 245 ) ) common/caulk 134217728 0 0
-( -1152 -832 -128 ) ( -1176 -832 -160 ) ( -1176 -832 -128 ) ( ( 0 0.0078125 11.5 ) ( -0.0078125 0 510 ) ) exx/wall-metalrib01 134217728 0 0
-( -1152 -768 -160 ) ( -1152 -576 -128 ) ( -1152 -576 -160 ) ( ( 0.015625 0 11 ) ( 0 0.015625 252 ) ) common/caulk 134217728 0 0
-( -1152 -576 -128 ) ( -1176 -576 -160 ) ( -1152 -576 -160 ) ( ( 0.00390625 0 250.25 ) ( 0 0.00390625 255 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( -1180 -816 -128 ) ( -1152 -688 -156 ) ( -1180 -688 -128 ) ( ( 0.0124999993 0 503.8000183105 ) ( 0 0.0252536982 18.7856216431 ) ) exx/panel-metal04 134217728 0 0
-}
-}
-{
-brushDef
-{
 ( -1336 -834 -320 ) ( -1336 -818 -320 ) ( -1328 -834 -328 ) ( ( -0.0625 0 204.875 ) ( 0 0.0441941619 31.7499847412 ) ) common/clip 134217728 0 0
 ( -1328 -818 -328 ) ( -1328 -818 -384 ) ( -1328 -834 -328 ) ( ( -0.03125 0 38.4375 ) ( 0 0.0357142873 1012.2857666016 ) ) common/clip 134217728 0 0
 ( -1336 -802 -320 ) ( -1336 -802 -384 ) ( -1328 -818 -384 ) ( ( 0 0.015625 1020 ) ( 0.015625 0 1001 ) ) common/clip 134217728 0 0
@@ -32061,6 +32061,26 @@ brushDef
 ( -1336 -574 -384 ) ( -1328 -574 -328 ) ( -1336 -574 -320 ) ( ( 0 0.015625 1020 ) ( -0.015625 0 23 ) ) common/clip 134217728 0 0
 }
 }
+{
+brushDef
+{
+( -1176 -576 -128 ) ( -1152 -768 -128 ) ( -1176 -768 -128 ) ( ( 0 0.015625 23 ) ( -0.015625 0 245 ) ) common/caulk 134217728 0 0
+( -1152 -832 -128 ) ( -1176 -832 -160 ) ( -1176 -832 -128 ) ( ( 0 0.0078125 11.5 ) ( -0.0078125 0 510 ) ) exx/wall-metalrib01 134217728 0 0
+( -1152 -768 -160 ) ( -1152 -576 -128 ) ( -1152 -576 -160 ) ( ( 0.015625 0 11 ) ( 0 0.015625 252 ) ) common/caulk 134217728 0 0
+( -1180 -816 -128 ) ( -1152 -688 -156 ) ( -1180 -688 -128 ) ( ( 0.0124999993 -0 -0.1999804676 ) ( 0 0.0252536982 0.7856216431 ) ) exx/panel-metal04 134217728 0 0
+( -1160 -592 64 ) ( -1168 -592 -64 ) ( -1160 -592 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+}
+}
+{
+brushDef
+{
+( -1320 -768 -128 ) ( -1344 -768 -128 ) ( -1320 -576 -128 ) ( ( 0 0.015625 23 ) ( -0.015625 0 245 ) ) common/caulk 134217728 0 0
+( -1320 -832 -128 ) ( -1320 -832 -160 ) ( -1344 -832 -128 ) ( ( 0 0.0078125 11.5 ) ( -0.0078125 0 510 ) ) exx/wall-metalrib01 134217728 0 0
+( -1344 -576 -160 ) ( -1344 -576 -128 ) ( -1344 -768 -160 ) ( ( 0.015625 0 245 ) ( 0 0.015625 252 ) ) common/caulk 134217728 0 0
+( -1316 -688 -128 ) ( -1344 -688 -156 ) ( -1316 -816 -128 ) ( ( 0.0124999993 -0 -0.0000195312 ) ( 0 0.0252536982 0.2144622803 ) ) exx/panel-metal04 134217728 0 0
+( -1316 -592 64 ) ( -1320 -592 -64 ) ( -1316 -592 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+}
+}
 }
 {
 "classname" "func_group"

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index a27f3d451cb62cf9b2e18fdb74daf443639d59f5..80fe037f8b566b2a7642686a0d88b78a0da50f94 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 10e
\ No newline at end of file
+Version: 10g