From: kuniuthefrogg Date: Sat, 31 Dec 2016 10:32:02 +0000 (+0100) Subject: bugfix X-Git-Tag: xonotic-v0.8.2~102^2~16 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0b89967d5a73f916f7efa3cb6e4ca810b88d6b0;p=xonotic%2Fxonotic-maps.pk3dir.git bugfix --- diff --git a/maps/boil.map b/maps/boil.map index 718ef69c..5a9ef0f7 100644 --- a/maps/boil.map +++ b/maps/boil.map @@ -692,9 +692,9 @@ brushDef ( 968 -48 -512 ) ( 968 -392 -512 ) ( 768 -48 -512 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/floor-pk02_floor09a 0 0 0 ( 912 512 -640 ) ( 712 512 -640 ) ( 912 512 -704 ) ( ( 0.0078125 0 1.0625 ) ( 0 0.0078125 0.5 ) ) exx/base-metal01 0 0 0 ( 1536 -232 -640 ) ( 1536 -232 -704 ) ( 1536 -576 -640 ) ( ( 0.0078125 0 1.5 ) ( 0 0.0625 4 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 -( 752 -1008 -704 ) ( 752 -1008 -640 ) ( 952 -1008 -704 ) ( ( 0.0078125 0 126.625 ) ( 0 0.0078125 0.5 ) ) exx/base-metal01 0 0 0 ( 768 -384 -704 ) ( 768 -40 -704 ) ( 768 -384 -640 ) ( ( 0.0078125 0 0 ) ( 0 0.0625 4 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( -64 -152 -528 ) ( -64 -168 -528 ) ( 64 -152 -528 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1448 -512 -64 ) ( 1416 -512 -64 ) ( 1448 -512 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 } } { @@ -2895,13 +2895,13 @@ brushDef brushDef { ( 1104 -288 680 ) ( 960 -288 680 ) ( 1104 -288 640 ) ( ( 0.0078125 0 0 ) ( 0 0.0625 -7 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 -( 1608 -304 680 ) ( 1608 -304 640 ) ( 1608 -384 680 ) ( ( 0.0078125 0 0.5 ) ( 0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( 960 -368 640 ) ( 1104 -368 640 ) ( 960 -288 640 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) exomorphx/floor-metal_panel_floor03b 0 0 0 ( 1032 -1008 640 ) ( 1032 -1008 680 ) ( 1176 -1008 640 ) ( ( 0.015625 0 254.875 ) ( 0 0.015625 0 ) ) exomorphx/base-metal03 0 0 0 ( 800 -384 640 ) ( 800 -304 640 ) ( 800 -384 680 ) ( ( 0.0078125 0 127.5 ) ( 0 0.0625 -7 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( 800 -352 -64 ) ( 808 -344 -64 ) ( 800 -352 64 ) ( ( 0.0078125 0 -0.171875 ) ( -0 0.0625 -7 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( 64 -392 672 ) ( -64 -400 672 ) ( -64 -392 672 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 ( 1552 -288 -64 ) ( 1600 -320 -64 ) ( 1552 -288 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( 1600 -600 -64 ) ( 1600 -608 -64 ) ( 1600 -600 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 } } { @@ -8446,9 +8446,9 @@ brushDef ( 912 512 -640 ) ( 712 512 -640 ) ( 912 512 -704 ) ( ( 0.0078125 0 1.0625 ) ( 0 0.0078125 0.5 ) ) exx/base-metal01 0 0 0 ( 1536 -232 -640 ) ( 1536 -232 -704 ) ( 1536 -576 -640 ) ( ( 0.00390625 0 0.75 ) ( 0 0.00390625 0.25 ) ) exomorphx/wall-metal_panel01 0 0 0 ( 768 -384 -704 ) ( 968 -384 -704 ) ( 768 -40 -704 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 1.5 ) ) exx/base-metal01 0 0 0 -( 752 -1008 -704 ) ( 752 -1008 -640 ) ( 952 -1008 -704 ) ( ( 0.0078125 0 126.625 ) ( 0 0.0078125 0.5 ) ) exx/base-metal01 0 0 0 ( 768 -384 -704 ) ( 768 -40 -704 ) ( 768 -384 -640 ) ( ( 0.015625 0 0 ) ( 0 0.015625 1 ) ) exomorphx/base-metal03 0 0 0 ( 64 -152 -528 ) ( -64 -168 -528 ) ( -64 -152 -528 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1472 -512 -64 ) ( 1456 -512 -64 ) ( 1472 -512 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 } } { @@ -11078,28 +11078,6 @@ brushDef { brushDef { -( -152 64 -264 ) ( -152 -256 -264 ) ( -264 64 -264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 0 0 0 -( -160 0 -264 ) ( -272 0 -264 ) ( -160 0 -280 ) ( ( 0.015625 0 254.75 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( -256 56 -264 ) ( -256 56 -280 ) ( -256 -264 -264 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( -264 -256 -400 ) ( -152 -256 -400 ) ( -264 64 -400 ) ( ( 0.015625 0 0 ) ( 0 0.015625 254.875 ) ) common/nodrawnonsolid 0 0 0 -( -280 -192 -280 ) ( -280 -192 -264 ) ( -168 -192 -280 ) ( ( 0.015625 0 1.375 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( -258 -256 -280 ) ( -258 64 -280 ) ( -258 -256 -264 ) ( ( 0.0052083335 0 0 ) ( 0 0.0073528457 510.0588684082 ) ) trak4x/decal-pills 0 0 0 -} -} -{ -brushDef -{ -( 1348 -64 -272 ) ( 1348 -320 -272 ) ( 1344 -64 -272 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( 1348 -116 -268 ) ( 1344 -116 -268 ) ( 1348 -116 -334 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.0625 ) ) common/nodrawnonsolid 0 0 0 -( 1346 -64 -272 ) ( 1346 -64 -338 ) ( 1346 -320 -272 ) ( ( 0.0072463769 0 1.8405797482 ) ( 0 0.0099999998 509.2799987793 ) ) trak4x/decal-wallpainting 0 0 0 -( 1344 -320 -372 ) ( 1348 -320 -372 ) ( 1344 -64 -372 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( 1344 -254 -340 ) ( 1344 -254 -274 ) ( 1348 -254 -340 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.96875 ) ) common/nodrawnonsolid 0 0 0 -( 1344 -320 -338 ) ( 1344 -64 -338 ) ( 1344 -320 -272 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -} -} -{ -brushDef -{ ( -58 144 -534 ) ( -58 -176 -534 ) ( -64 144 -534 ) ( ( 0.0078125 0 0.765625 ) ( 0 0.1666666716 10.6666669846 ) ) common/nodrawnonsolid 0 0 0 ( -58 30 -608 ) ( -64 30 -608 ) ( -58 30 -656 ) ( ( 0.1666666716 0 246.3333282471 ) ( 0 0.0084745763 251.4745788574 ) ) common/nodrawnonsolid 0 0 0 ( -62 158 -604 ) ( -62 158 -652 ) ( -62 -162 -604 ) ( ( 0.0078125 0 0.765625 ) ( 0 0.0084745763 251.4745788574 ) ) trak4x/decal-theater2 0 0 0 @@ -11114,7 +11092,7 @@ brushDef ( 1344 746 -456 ) ( 1344 708 -456 ) ( 1306 746 -456 ) ( ( 0.015625 0 255.9375 ) ( 0 0.015625 255.5 ) ) common/nodrawnonsolid 0 0 0 ( 1306 696 -622 ) ( 1344 696 -622 ) ( 1306 734 -622 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0.5 ) ) common/nodrawnonsolid 0 0 0 ( 1350 698 -360 ) ( 1348 700 -360 ) ( 1350 698 -232 ) ( ( 0.0156249953 0 255.6464538574 ) ( 0 0.015625 251.375 ) ) common/nodrawnonsolid 0 0 0 -( 1382 680 -360 ) ( 1384 678 -360 ) ( 1382 680 -232 ) ( ( 0.0039283712 0 1.9611111879 ) ( 0 0.0060240217 253.2530670166 ) ) trak4x/decal-help 0 0 0 +( 1382 680 -360 ) ( 1384 678 -360 ) ( 1382 680 -232 ) ( ( 0.0039283712 0 1.9611110687 ) ( 0 0.0060241045 447.2529907227 ) ) map_boil/frogg 0 0 0 ( 1384 678 -360 ) ( 1382 676 -360 ) ( 1384 678 -232 ) ( ( 0.0156249944 0 255.5580596924 ) ( 0 0.015625 251.375 ) ) common/nodrawnonsolid 0 0 0 ( 1198 852 -360 ) ( 1200 854 -360 ) ( 1198 852 -232 ) ( ( 0.0156249925 0 0.3535533547 ) ( 0 0.015625 251.375 ) ) common/nodrawnonsolid 0 0 0 } @@ -11133,17 +11111,6 @@ brushDef { brushDef { -( 1344 -64 184 ) ( 1344 -72 184 ) ( 1040 -64 184 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( 1288 -62 152 ) ( 984 -62 152 ) ( 1288 -62 96 ) ( ( 0.0062500001 0 8.0500020981 ) ( 0 0.0113636367 2.0909090042 ) ) trak4x/decal-theater1 0 0 0 -( 1288 -56 152 ) ( 1288 -56 96 ) ( 1288 -64 152 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.375 ) ) common/nodrawnonsolid 0 0 0 -( 1040 -64 96 ) ( 1344 -64 96 ) ( 1040 -56 96 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 -( 1040 -64 96 ) ( 1040 -64 152 ) ( 1344 -64 96 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.375 ) ) common/nodrawnonsolid 0 0 0 -( 1128 -56 96 ) ( 1128 -48 96 ) ( 1128 -56 152 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 255.375 ) ) common/nodrawnonsolid 0 0 0 -} -} -{ -brushDef -{ ( 464 -576 640 ) ( 480 -576 640 ) ( 464 -584 640 ) ( ( 0 -0.015625 11.5 ) ( 0.015625 0 16 ) ) common/caulk 134217728 0 0 ( 448 -580 640 ) ( 448 -588 640 ) ( 448 -580 512 ) ( ( 0.00390625 0 60.75 ) ( 0 0.00390625 1.75 ) ) exomorphx/wall-metal_panel01 134217728 0 0 ( 464 -576 640 ) ( 464 -576 512 ) ( 480 -576 640 ) ( ( 0.015625 0 11.5 ) ( 0 0.015625 7 ) ) common/caulk 134217728 0 0 @@ -11681,12 +11648,34 @@ brushDef { brushDef { -( 640 288 -256 ) ( 640 280 -256 ) ( 536 288 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/nodrawnonsolid 134217728 0 0 -( 640 288 -256 ) ( 536 288 -256 ) ( 640 288 -384 ) ( ( 0.015625 0 255.75 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( 640 288 -256 ) ( 640 288 -384 ) ( 640 280 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( 536 280 -384 ) ( 640 280 -384 ) ( 536 288 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/nodrawnonsolid 134217728 0 0 -( 536 286 -384 ) ( 536 286 -256 ) ( 640 286 -384 ) ( ( 0.009615385 0 543.8461914063 ) ( 0 0.0078125 448 ) ) map_boil/frogg 134217728 0 0 -( 536 280 -384 ) ( 536 288 -384 ) ( 536 280 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 +( 1608 -304 680 ) ( 1608 -304 640 ) ( 1608 -384 680 ) ( ( 0.0078125 0 0.5 ) ( 0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( 960 -368 640 ) ( 1104 -368 640 ) ( 960 -288 640 ) ( ( 0.00390625 0 -0 ) ( -0 0.015625 0 ) ) exomorphx/light-metal_light01 0 0 0 +( 1032 -1008 640 ) ( 1032 -1008 680 ) ( 1176 -1008 640 ) ( ( 0.015625 0 254.875 ) ( 0 0.015625 0 ) ) exomorphx/base-metal03 0 0 0 +( 64 -392 672 ) ( -64 -400 672 ) ( -64 -392 672 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1552 -288 -64 ) ( 1600 -320 -64 ) ( 1552 -288 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( 1600 -600 64 ) ( 1600 -608 -64 ) ( 1600 -600 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +} +} +{ +brushDef +{ +( 968 -48 -512 ) ( 968 -392 -512 ) ( 768 -48 -512 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/floor-pk02_floor09a 0 0 0 +( 1520 -232 -640 ) ( 1520 -232 -704 ) ( 1520 -576 -640 ) ( ( 0.0078125 0 1.5 ) ( 0 0.0625 4 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( 752 -1008 -704 ) ( 752 -1008 -640 ) ( 952 -1008 -704 ) ( ( 0.0078125 0 126.625 ) ( 0 0.0078125 0.5 ) ) exx/base-metal01 0 0 0 +( 768 -384 -704 ) ( 768 -40 -704 ) ( 768 -384 -640 ) ( ( 0.0078125 0 0 ) ( 0 0.0625 4 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( -64 -152 -528 ) ( -64 -168 -528 ) ( 64 -152 -528 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1448 -512 64 ) ( 1416 -512 -64 ) ( 1448 -512 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +} +} +{ +brushDef +{ +( 1520 -232 -640 ) ( 1520 -232 -704 ) ( 1520 -576 -640 ) ( ( 0.00390625 0 0.75 ) ( 0 0.00390625 0.25 ) ) exomorphx/wall-metal_panel01 0 0 0 +( 768 -384 -704 ) ( 968 -384 -704 ) ( 768 -40 -704 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 1.5 ) ) exx/base-metal01 0 0 0 +( 752 -1008 -704 ) ( 752 -1008 -640 ) ( 952 -1008 -704 ) ( ( 0.0078125 0 126.625 ) ( 0 0.0078125 0.5 ) ) exx/base-metal01 0 0 0 +( 768 -384 -704 ) ( 768 -40 -704 ) ( 768 -384 -640 ) ( ( 0.015625 0 0 ) ( 0 0.015625 1 ) ) exomorphx/base-metal03 0 0 0 +( 64 -152 -528 ) ( -64 -168 -528 ) ( -64 -152 -528 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 +( 1472 -512 64 ) ( 1456 -512 -64 ) ( 1472 -512 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 } } } diff --git a/maps/boil.map.options b/maps/boil.map.options index 93540cb5..75e005f3 100644 --- a/maps/boil.map.options +++ b/maps/boil.map.options @@ -4,4 +4,4 @@ -vis + -minimap + -sRGB -Version: 6 +Version: 7