From: kuniuthefrogg Date: Wed, 23 Nov 2016 11:15:01 +0000 (+0100) Subject: use Mirios txtures, bugfix X-Git-Tag: xonotic-v0.8.2~102^2~25 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9da6698a976d180e660266a6747f3ecd3e0ba278;p=xonotic%2Fxonotic-maps.pk3dir.git use Mirios txtures, bugfix --- diff --git a/maps/boil.jpg b/maps/boil.jpg index 574c1c16..56f744d1 100644 Binary files a/maps/boil.jpg and b/maps/boil.jpg differ diff --git a/maps/boil.map b/maps/boil.map index 5f9257ff..f9794278 100644 --- a/maps/boil.map +++ b/maps/boil.map @@ -2043,7 +2043,7 @@ brushDef { ( 768 1016 1408 ) ( 768 1016 -768 ) ( 768 952 1408 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( 440 0 -768 ) ( 440 0 1408 ) ( 568 0 -768 ) ( ( 0.0078125 0 -0.1875 ) ( 0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 -( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.0078125 0 -0.25 ) ( -0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.0078125 0 -0.5 ) ( -0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( -64 512 -248 ) ( -64 512 -280 ) ( 64 512 -248 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 ( -64 168 -384 ) ( -64 200 -384 ) ( 64 168 -384 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) exomorphx/floor-metal_panel_floor03b 0 0 0 ( 64 40 -416 ) ( -64 48 -416 ) ( -64 40 -416 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 @@ -2054,7 +2054,7 @@ brushDef { ( 576 1008 1408 ) ( 448 1008 1408 ) ( 576 1008 -768 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal01 0 0 0 ( 768 1016 1408 ) ( 768 1016 -768 ) ( 768 952 1408 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) exx/base-metal01 0 0 0 -( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.0078125 0 -0.25 ) ( -0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 +( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.0078125 0 -0.5 ) ( -0 0.0625 0 ) ) exomorphx/trim-metal_panel05_red-1 0 0 0 ( 64 512 -248 ) ( -64 512 -280 ) ( -64 512 -248 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 0 0 0 ( 64 40 -416 ) ( -64 48 -416 ) ( -64 40 -416 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 ( 64 72 -384 ) ( -64 64 -384 ) ( -64 72 -384 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) exomorphx/floor-metal_panel_floor03b 0 0 0 @@ -2344,7 +2344,7 @@ brushDef { ( 576 1008 1408 ) ( 448 1008 1408 ) ( 576 1008 -768 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal01 0 0 0 ( 768 1016 1408 ) ( 768 1016 -768 ) ( 768 952 1408 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) exx/base-metal01 0 0 0 -( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.00390625 0 -0.125 ) ( -0 0.00390625 0 ) ) exomorphx/wall-metal_panel03 0 0 0 +( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.00390625 0 -0.25 ) ( -0 0.00390625 0 ) ) exomorphx/wall-metal_panel03 0 0 0 ( 64 512 -248 ) ( -64 512 -280 ) ( -64 512 -248 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 0 0 0 ( -64 40 -416 ) ( -64 48 -416 ) ( 64 40 -416 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 ( 64 88 -512 ) ( -64 104 -512 ) ( -64 88 -512 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) exomorphx/base-metal03 0 0 0 @@ -2355,7 +2355,7 @@ brushDef { ( 768 1016 1408 ) ( 768 1016 -768 ) ( 768 952 1408 ) ( ( 0.00390625 0 0.03125 ) ( 0 0.00390625 0 ) ) exomorphx/wall-metal_panel03 0 0 0 ( 440 0 -768 ) ( 440 0 1408 ) ( 568 0 -768 ) ( ( 0.00390625 0 -0.09375 ) ( 0 0.00390625 0 ) ) exomorphx/wall-metal_panel03 0 0 0 -( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.00390625 0 -0.125 ) ( -0 0.00390625 0 ) ) exomorphx/wall-metal_panel03 0 0 0 +( 448 960 -768 ) ( 448 1024 -768 ) ( 448 960 1408 ) ( ( 0.00390625 0 -0.25 ) ( -0 0.00390625 0 ) ) exomorphx/wall-metal_panel03 0 0 0 ( -64 512 -248 ) ( -64 512 -280 ) ( 64 512 -248 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 ( -64 40 -416 ) ( -64 48 -416 ) ( 64 40 -416 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0 ( 64 88 -512 ) ( -64 104 -512 ) ( -64 88 -512 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) exomorphx/floor-metal_panel_floor03b 0 0 0 @@ -9807,6 +9807,7 @@ brushDef ( 768 368 -384 ) ( 768 368 -256 ) ( 784 368 -384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0 ( 704 384 -384 ) ( 704 400 -384 ) ( 704 384 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0 ( 784 384 -64 ) ( 768 368 -64 ) ( 784 384 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 768 64 -256 ) ( 784 64 -272 ) ( 768 -64 -256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 } } { @@ -11201,10 +11202,10 @@ brushDef { ( 512 -768 256 ) ( 496 -768 256 ) ( 512 -768 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 ( 512 -768 256 ) ( 512 -768 224 ) ( 512 -992 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 -( 496 -992 224 ) ( 496 -992 256 ) ( 512 -992 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 ( 512 64 136 ) ( 496 64 248 ) ( 512 -64 136 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 ( 496 64 256 ) ( 512 64 264 ) ( 496 -64 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 ( 496 64 240 ) ( 496 64 248 ) ( 496 -64 240 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 512 -816 -64 ) ( 496 -800 -64 ) ( 512 -816 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 } } { @@ -11471,6 +11472,49 @@ brushDef ( 128 380 4 ) ( 128 384 0 ) ( 0 380 4 ) ( ( -0.015625 0 1 ) ( 0 -0.0156249944 9.5017776489 ) ) exomorphx/base-metal03 134217728 0 0 } } +{ +brushDef +{ +( 1088 -64 -180 ) ( 1088 -64 -204 ) ( 1088 -320 -180 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 1084 -320 -204 ) ( 1088 -320 -204 ) ( 1084 -64 -204 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 1084 -160 -64 ) ( 1088 -156 -64 ) ( 1084 -160 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 1088 -228 -64 ) ( 1084 -224 -64 ) ( 1088 -228 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 1084 64 -204 ) ( 1088 64 -180 ) ( 1084 -64 -204 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} +{ +brushDef +{ +( 512 -768 256 ) ( 512 -768 224 ) ( 512 -992 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 496 -992 224 ) ( 496 -992 256 ) ( 512 -992 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 512 64 136 ) ( 496 64 248 ) ( 512 -64 136 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 496 64 256 ) ( 512 64 264 ) ( 496 -64 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 496 64 240 ) ( 496 64 248 ) ( 496 -64 240 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 496 -960 -64 ) ( 512 -944 -64 ) ( 496 -960 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} +{ +brushDef +{ +( 1344 -320 376 ) ( 1344 -328 376 ) ( 1088 -320 376 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 1344 -320 352 ) ( 1088 -320 352 ) ( 1344 -320 272 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 1312 -320 352 ) ( 1312 -320 272 ) ( 1312 -328 352 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 1088 -328 264 ) ( 1344 -328 264 ) ( 1088 -320 264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 1088 -322 272 ) ( 1088 -322 352 ) ( 1344 -322 272 ) ( ( 0.0062500001 0 504.799987793 ) ( 0 0.0089285709 3.3571426868 ) ) map_boil/credit 0 0 0 +( 1152 -320 272 ) ( 1152 -312 272 ) ( 1152 -320 352 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +} +} +{ +brushDef +{ +( 952 960 -280 ) ( 952 952 -280 ) ( 800 960 -280 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 952 960 -256 ) ( 800 960 -256 ) ( 952 960 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 952 960 -256 ) ( 952 960 -384 ) ( 952 952 -256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 800 952 -360 ) ( 952 952 -360 ) ( 800 960 -360 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +( 798 958 -384 ) ( 798 958 -256 ) ( 950 958 -384 ) ( ( 0.0073529407 0 599 ) ( 0 0.0125000011 327.5 ) ) map_boil/brush 0 0 0 +( 816 952 -384 ) ( 816 960 -384 ) ( 816 952 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0 +} +} } { "classname" "info_player_deathmatch" @@ -11823,7 +11867,7 @@ brushDef { "classname" "light" "origin" "1440.000000 -416.000000 584.000000" -"light" "10" +"light" "30" "_color" "1 0 0" } { @@ -11865,13 +11909,13 @@ brushDef { "classname" "light" "origin" "1120.000000 -416.000000 584.000000" -"light" "10" +"light" "30" "_color" "1 0 0" } { "classname" "light" "origin" "1280.000000 -416.000000 584.000000" -"light" "10" +"light" "30" "_color" "1 0 0" } { @@ -11920,31 +11964,6 @@ brushDef "angle" "-60.000000" } { -"classname" "info_autoscreenshot" -"origin" "1488.000000 -976.000000 -216.000000" -"angle" "135.000015" -} -{ -"classname" "item_health_small" -"origin" "-480.000000 -224.000000 -416.000000" -} -{ -"classname" "item_health_small" -"origin" "-480.000000 -160.000000 -440.000000" -} -{ -"classname" "item_health_small" -"origin" "-480.000000 -96.000000 -440.000000" -} -{ -"classname" "item_health_small" -"origin" "-480.000000 -32.000000 -440.000000" -} -{ -"classname" "item_health_small" -"origin" "-480.000000 32.000000 -448.000000" -} -{ "classname" "item_health_medium" "origin" "-176.000000 96.000000 8.000000" } @@ -11983,3 +12002,23 @@ brushDef "origin" "128.000000 256.000000 32.000000" "light" "70" } +{ +"classname" "item_health_small" +"origin" "-376.000000 -552.000000 -312.000000" +} +{ +"classname" "item_health_small" +"origin" "-120.000000 -808.000000 -312.000000" +} +{ +"classname" "item_health_small" +"origin" "-184.000000 -744.000000 -312.000000" +} +{ +"classname" "item_health_small" +"origin" "-248.000000 -680.000000 -312.000000" +} +{ +"classname" "item_health_small" +"origin" "-312.000000 -616.000000 -312.000000" +} diff --git a/maps/boil.map.options b/maps/boil.map.options index 70e414d9..82e36068 100644 --- a/maps/boil.map.options +++ b/maps/boil.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 2 +Version: 3