Merge branch 'master' into justin/erbium

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index f3dc1c8edd365eb95e59f077d7961bc41751298e..327bb551bfe3f9dc8b7289319524dc7ec56e9560 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -12124,14 +12124,6 @@ trak5x/base-pipe1C
 }
 }
 {
-( -116 -536 520 ) ( -108 -528 520 ) ( -108 -536 520 ) common/caulk 224 160 90 0.25 -0.25 134217728 0 0
-( -116 -528 528 ) ( -116 -536 480 ) ( -116 -528 480 ) exx/trim-vert01 0 128 0 0.25 0.25 134217728 0 0
-( -116 -528 528 ) ( -108 -528 480 ) ( -108 -528 528 ) exx/trim-vert01 16 128 0 0.25 0.25 134217728 0 0
-( -116 -528 464 ) ( -108 -536 464 ) ( -108 -528 464 ) exx/trim-vert01 16 416 0 0.25 -0.25 134217728 0 0
-( -108 -536 528 ) ( -108 -528 480 ) ( -108 -536 480 ) exx/trim-vert01 0 128 0 0.25 0.25 134217728 0 0
-( -116 -536 480 ) ( -108 -536 528 ) ( -108 -536 480 ) exx/trim-vert01 16 128 0 0.25 0.25 134217728 0 0
-}
-{
 patchDef2
 {
 trak5x/base-pipe1C
@@ -25082,14 +25074,6 @@ trak5x/base-pipe1b
 }
 }
 {
-( -2200 1556 520 ) ( -2192 1556 520 ) ( -2200 1548 520 ) common/caulk 224 160 0 0.25 0.25 134217728 0 0
-( -2192 1548 480 ) ( -2200 1548 480 ) ( -2192 1548 528 ) exx/trim-vert01 0 128 0 0.25 0.25 134217728 0 0
-( -2192 1556 528 ) ( -2192 1556 480 ) ( -2192 1548 528 ) exx/trim-vert01 16 128 0 0.25 0.25 134217728 0 0
-( -2192 1556 464 ) ( -2200 1556 464 ) ( -2192 1548 464 ) exx/trim-vert01 16 416 90 0.25 0.25 134217728 0 0
-( -2200 1556 480 ) ( -2192 1556 480 ) ( -2200 1556 528 ) exx/trim-vert01 0 128 0 0.25 0.25 134217728 0 0
-( -2200 1556 480 ) ( -2200 1556 528 ) ( -2200 1548 480 ) exx/trim-vert01 16 128 0 0.25 0.25 134217728 0 0
-}
-{
 patchDef2
 {
 trak5x/base-pipe1b
@@ -29425,14 +29409,12 @@ exx/base-metal03
 "origin" "-288.000000 -208.000000 112.000000"
 "targetname" "t6"
 "angle" "-90.000000"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "target_position"
 "origin" "-288.000000 -176.000000 112.000000"
 "targetname" "t7"
 "angle" "-90.000000"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "trigger_push"
@@ -29451,7 +29433,6 @@ exx/base-metal03
 "origin" "-288.000000 -240.000000 112.000000"
 "targetname" "t8"
 "angle" "-90.000000"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "trigger_push"
@@ -29595,7 +29576,6 @@ exx/base-metal03
 "classname" "item_armor_large"
 "origin" "-160.000000 -208.000000 16.000000"
 "angle" "-90.000000"
-"gametypefilter" "+dm,arena"
 }
 {
 "classname" "item_health_small"
@@ -32864,14 +32844,12 @@ exx/base-metal03
 "origin" "-1872.000000 1376.000000 112.000000"
 "targetname" "t47"
 "angle" "0.000003"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "target_position"
 "origin" "-1840.000000 1376.000000 112.000000"
 "targetname" "t50"
 "angle" "0.000003"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "trigger_push"
@@ -32890,7 +32868,6 @@ exx/base-metal03
 "origin" "-1904.000000 1376.000000 112.000000"
 "targetname" "t51"
 "angle" "0.000003"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "trigger_push"
@@ -34650,7 +34627,6 @@ exx/base-metal03
 "classname" "info_player_deathmatch"
 "angle" "-180.000000"
 "origin" "-1104.000000 2064.000000 24.000000"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "info_player_deathmatch"
@@ -36193,7 +36169,6 @@ exx/base-metal03
 "classname" "info_player_team1"
 "angle" "-180.000000"
 "origin" "-1112.000000 2048.000000 40.000000"
-"gametypefilter" "-dm,arena"
 }
 {
 "classname" "info_player_team1"
@@ -36479,41 +36454,35 @@ effects_healpod/healpod1_d
 "origin" "-864.000000 800.000000 -296.000000"
 "targetname" "middlelowcpspawns"
 "angle" "180.000000"
-"gametypefilter" "-dm"
 }
 {
 "classname" "info_player_deathmatch"
 "origin" "-1936.000000 -272.000000 80.000000"
 "targetname" "middlehighcpspawns"
-"gametypefilter" "-dm"
 }
 {
 "classname" "info_player_deathmatch"
 "origin" "-352.000000 1056.000000 -232.000000"
 "targetname" "middlelowcpspawns"
 "angle" "90.000000"
-"gametypefilter" "-dm"
 }
 {
 "classname" "info_player_deathmatch"
 "origin" "-2080.000000 -672.000000 136.000000"
 "targetname" "middlehighcpspawns"
 "angle" "-90.000000"
-"gametypefilter" "-dm"
 }
 {
 "classname" "info_player_deathmatch"
 "origin" "-608.000000 1312.000000 -232.000000"
 "targetname" "middlelowcpspawns"
 "angle" "-179.999985"
-"gametypefilter" "-dm"
 }
 {
 "classname" "info_player_deathmatch"
 "origin" "-2336.000000 -416.000000 136.000000"
 "targetname" "middlehighcpspawns"
 "angle" "0.000003"
-"gametypefilter" "-dm"
 }
 {
 "classname" "misc_breakablemodel"
@@ -36617,3 +36586,8 @@ effects_healpod/healpod1_d
 "angle" "-179.999985"
 "message" " has captured the ^2Red base ^3control point"
 }
+{
+"classname" "item_armor_large"
+"origin" "-1872.000000 1504.000000 16.000000"
+"angle" "179.999985"
+}

diff --git a/maps/runningmanctf.map.options b/maps/runningmanctf.map.options
index 2fded1aaee2669f24b216f76aa784ab2a7050ef7..637ffec4d643e1ca95953bb82fed7a028af5e60c 100644 (file)
--- a/maps/runningmanctf.map.options
+++ b/maps/runningmanctf.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 10c
+Version: 10d