From: Mirio Date: Sun, 24 May 2015 17:55:41 +0000 (+0200) Subject: Add decals, bubbles to teleporter exits. Fix zfight X-Git-Tag: xonotic-v0.8.1~9^2~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3bfb4981278e3cc0ba6cc8b67fb012507415ddc2;p=xonotic%2Fxonotic-maps.pk3dir.git Add decals, bubbles to teleporter exits. Fix zfight --- diff --git a/maps/atelier.map b/maps/atelier.map index 3d9593ee..3016a558 100644 --- a/maps/atelier.map +++ b/maps/atelier.map @@ -11780,6 +11780,22 @@ common/clip ( 184 -1272 480 ) ( 248 -1272 480 ) ( 248 -1272 512 ) trak5x/trim/trim_basictrim1a 0 0 90 0.25 0.25 134217728 0 0 ( 352 -64 512 ) ( 352 64 480 ) ( 352 64 512 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0 } +{ +( -681.8000030518 -363 64 ) ( -681.8000030518 -107 64 ) ( -681.8000030518 -363 320 ) common/caulk 172 0 0 0.25 0.25 0 0 0 +( -614.6000061035 -363 64 ) ( -614.6000061035 -619 64 ) ( -614.6000061035 -363 320 ) common/caulk 172 0 0 0.25 0.25 0 0 0 +( -245 -441.3999938965 64 ) ( -245 -441.3999938965 -192 ) ( -501 -441.3999938965 64 ) common/caulk 212 0 0 0.25 0.25 0 0 0 +( -245 -374.1999969482 64 ) ( -245 -374.1999969482 320 ) ( -501 -374.1999969482 64 ) common/caulk 212 0 0 0.25 0.25 0 0 0 +( -245 -363 512 ) ( -501 -363 512 ) ( -245 -619 512 ) common/caulk 212 84 0 0.25 0.25 0 0 0 +( -681.8000030518 -441.3999938965 513.3999938965 ) ( -681.8000030518 -374.1999969482 513.3999938965 ) ( -614.6000061035 -374.1999969482 513.3999938965 ) decals/scorch01 74.6655273438 220.9536132813 0 0.1312500238 0.1312500387 0 0 0 +} +{ +( 342.1999969482 1517 -64 ) ( 342.1999969482 1773 -64 ) ( 342.1999969482 1517 192 ) common/caulk 76 0 0 0.25 0.25 0 0 0 +( 409.3999938965 1517 -64 ) ( 409.3999938965 1261 -64 ) ( 409.3999938965 1517 192 ) common/caulk 76 0 0 0.25 0.25 0 0 0 +( 779 1438.6000061035 -64 ) ( 779 1438.6000061035 -320 ) ( 523 1438.6000061035 -64 ) common/caulk 212 0 0 0.25 0.25 0 0 0 +( 779 1505.8000030518 -64 ) ( 779 1505.8000030518 192 ) ( 523 1505.8000030518 -64 ) common/caulk 212 0 0 0.25 0.25 0 0 0 +( 779 1517 384 ) ( 523 1517 384 ) ( 779 1261 384 ) common/caulk 212 180 0 0.25 0.25 0 0 0 +( 342.1999969482 1438.6000061035 384.3999938965 ) ( 342.1999969482 1505.8000030518 384.3999938965 ) ( 409.3999938965 1505.8000030518 384.3999938965 ) decals/scorch01 464.7617492676 208.759552002 0 0.1312500238 0.1312500387 0 0 0 +} } { "classname" "func_group" @@ -37039,10 +37055,10 @@ exx/base-metal01 { ( 552 1064 248 ) ( 536 1064 248 ) ( 552 1192 248 ) common/trigger 160 96 -90 0.25 0.25 0 0 0 ( 552 1064 320 ) ( 552 1192 320 ) ( 552 1064 128 ) common/trigger 160 0 0 -0.25 0.25 0 0 0 -( 552 1112 320 ) ( 552 1112 128 ) ( 536 1112 320 ) common/trigger 160 0 0 0.25 0.25 0 0 0 +( 552 1107 320 ) ( 552 1107 128 ) ( 536 1107 320 ) common/trigger 160 0 0 0.25 0.25 0 0 0 ( 536 1192 128 ) ( 536 1064 128 ) ( 552 1192 128 ) common/trigger 160 96 -90 0.25 0.25 0 0 0 -( 544 1192 128 ) ( 544 1192 320 ) ( 544 1064 128 ) common/trigger 160 0 0 -0.25 0.25 0 0 0 -( 536 1192 128 ) ( 552 1192 128 ) ( 536 1192 320 ) common/trigger 160 0 0 0.25 0.25 0 0 0 +( 520 1193 128 ) ( 520 1193 320 ) ( 520 1065 128 ) common/trigger 164 0 0 -0.25 0.25 0 0 0 +( 536 1197 128 ) ( 552 1197 128 ) ( 536 1197 320 ) common/trigger 160 0 0 0.25 0.25 0 0 0 } } { @@ -37214,7 +37230,7 @@ exx/base-metal01 } { "classname" "info_player_deathmatch" -"origin" "-1024.000000 1517.000000 153.000000" +"origin" "-1024.000000 1512.000000 153.000000" "angle" "-124.999992" } { @@ -37239,7 +37255,7 @@ exx/base-metal01 } { "classname" "info_player_deathmatch" -"origin" "-1056.000000 -160.000000 24.000000" +"origin" "-1052.000000 -155.000000 24.000000" "angle" "45.000000" } { @@ -38617,7 +38633,6 @@ exx/floor-tile03 "classname" "misc_teleporter_dest" "origin" "-648.000000 -408.000000 536.000000" "targetname" "misc_teleporter_dest1" -"angle" "45.000000" } { "classname" "func_group" @@ -40803,9 +40818,9 @@ patchDef2 common/clip ( 3 3 0 0 0 ) ( -( ( 17.75 159.375 960.0000610352 -0.25 0 ) ( 17.75 -128.625 960.0000610352 2.7499997616 0 ) ( -270.25 -128.625 960.0000610352 5.7499995232 0 ) ) -( ( 17.75 159.375 764.0000610352 -0.25 0.4999999702 ) ( 17.75 -128.625 764.0000610352 2.7499997616 0.5000005364 ) ( -270.25 -128.625 764.0000610352 5.7499995232 0.5000005364 ) ) -( ( 49.75 159.375 764.0000610352 -0.25 0.9999999404 ) ( 49.75 -160.625 764.0000610352 2.75 0.999999702 ) ( -270.25 -160.625 764.0000610352 5.7499995232 1.0000010729 ) ) +( ( 17.75 158.375 960.0000610352 -0.25 0 ) ( 17.75 -129.625 960.0000610352 2.7499997616 0 ) ( -270.25 -129.625 960.0000610352 5.7499995232 0 ) ) +( ( 17.75 158.375 764.0000610352 -0.25 0.4999999702 ) ( 17.75 -129.625 764.0000610352 2.7499997616 0.5000005364 ) ( -270.25 -129.625 764.0000610352 5.7499995232 0.5000005364 ) ) +( ( 49.75 158.375 764.0000610352 -0.25 0.9999999404 ) ( 49.75 -161.625 764.0000610352 2.75 0.999999702 ) ( -270.25 -161.625 764.0000610352 5.7499995232 1.0000010729 ) ) ) } } @@ -40885,3 +40900,11 @@ common/weapclip } } } +{ +"classname" "func_stardust" +"origin" "-648.000000 -408.000000 520.000000" +} +{ +"classname" "func_stardust" +"origin" "376.000000 1472.000000 393.000000" +} diff --git a/maps/atelier.map.options b/maps/atelier.map.options index bd67394b..e0bbf7e8 100644 --- a/maps/atelier.map.options +++ b/maps/atelier.map.options @@ -2,5 +2,5 @@ -light + -bounce 8 -dirtscale 2 -vis + -minimap + -Version: 1f +Version: 1g