Merge branch 'master' into Mirio/dance

diff --git a/maps/campaignxonoticbeta.txt b/maps/campaignxonoticbeta.txt
index 6f195ad582a03c799aca7cacd193f617db3eb39a..79238be067422fdb9e2992c6ba4f7442cf146590 100644 (file)
--- a/maps/campaignxonoticbeta.txt
+++ b/maps/campaignxonoticbeta.txt
@@ -5,7 +5,7 @@
 "ctf","dance","9","3","3",,,"Capture the Flag: Dance","In CTF you have to take the other teams flag and bring it to your base. Also your own flag has to be in your base for a successful capture!\n3 captures to win. "
 "dm","g-23","6","3","15",,,"Deathmatch: Docking Station G-23","Again a DM match, but the bots are slightly better now."
 "dom","atelier","11","4","50",,,"Domination: Atelier","Defend the control points and kill intruders to win."
-"kh","runningmanctf","4","5","500",,,"Key Hunt: Running Man","Every team holds a key. You have to collect them (kill key holders and pick them up) and meet with the other key holder in your team."
+"kh","runningmanctf","5","5","500",,,"Key Hunt: Running Man","Every team holds a key. You have to collect them (kill key holders and pick them up) and meet with the other key holder in your team."
 "ctf","catharsis","13","5","5",,,"Capture the Flag: Catharsis","Another crowded CTF experience before you jump into the Multiplayer."
 "dm","solarium","8","5","15",,"g_nix 1","[Special] Deathmatch: Solarium","NIX: In this mutator everyone will spawn with the same weapon, but the weapon will change randomly after some time."
 "ka","runningman","6","6","15",,,"Keepaway: Running Man","Pick up the ball and frag everything that moves!\nHint: You can shoot through warpzones!"

diff --git a/maps/dance.map b/maps/dance.map
index 884c6df2bbf44a98ea0d087e4222d2f695c983ee..4082aef79372e0d4cb70364bf3d4891d0dbc2a7c 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -21236,18 +21236,6 @@ effects_jumppad/jumppadfx1_a
 "lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
-"classname" "trigger_impulse"
-"strength" "0.1"
-{
-( 3072 3584 -1024 ) ( 3072 -3584 -1024 ) ( -3072 3584 -1024 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 3072 3584 -768 ) ( -3072 3584 -768 ) ( 3072 3584 -1792 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 3072 3584 -768 ) ( 3072 3584 -1792 ) ( 3072 -3584 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -3072 -3584 -1792 ) ( 3072 -3584 -1792 ) ( -3072 3584 -1792 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -3072 -3584 -1792 ) ( -3072 -3584 -768 ) ( 3072 -3584 -1792 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -3072 -3584 -1792 ) ( -3072 3584 -1792 ) ( -3072 -3584 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-}
-}
-{
 "classname" "weapon_uzi"
 "origin" "1024.000000 -640.000000 -172.000000"
 }

diff --git a/maps/drain.map b/maps/drain.map
index 974bfc1a5ecd18e8f43115f3536c609c3ea5d08c..adfbcbd36b039b10e49574de931b028c512a3497 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -11725,7 +11725,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.953918 -185.306213 -255.896118"
+"origin" "-84.000000 -156.000183 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11746,11 +11746,10 @@ trak5x/base-pipe1d
 "noise" "sound/weapons/rocket_impact.ogg"
 "respawntime" "35"
 "respawntimejitter" "10"
-"angles" "4.870223 136.066513 -11.980032"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-116.000000 -228.000183 -256.000000"
+"origin" "-592.000000 -1240.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11774,7 +11773,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-93.158936 -267.833984 -261.061523"
+"origin" "-632.000000 -1240.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11795,11 +11794,10 @@ trak5x/base-pipe1d
 "noise" "sound/weapons/rocket_impact.ogg"
 "respawntime" "35"
 "respawntimejitter" "10"
-"angles" "-2.919404 101.826599 3.361983"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.866486 -230.319901 -259.142639"
+"origin" "524.000122 -539.999878 -64.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11820,59 +11818,18 @@ trak5x/base-pipe1d
 "noise" "sound/weapons/rocket_impact.ogg"
 "respawntime" "35"
 "respawntimejitter" "10"
-"angles" "-2.255236 -110.983025 4.840920"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-592.000000 -1240.000000 -256.000000"
-"model" "models/containers/barrel01.md3"
-"modelscale" "1.200000"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"debrisdamageforcescale" "1"
-"debrisfadetime" "1"
-"debrissolid" "0"
-"debristime" "5"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "190"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "35"
-"respawntimejitter" "10"
+"classname" "item_shells"
+"origin" "-436.000000 -824.000000 -64.000000"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-632.000000 -1240.000000 -256.000000"
-"model" "models/containers/barrel01.md3"
-"modelscale" "1.200000"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"debrisdamageforcescale" "1"
-"debrisfadetime" "1"
-"debrissolid" "0"
-"debristime" "5"
-"debristimejitter" "2"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_force" "600"
-"dmg_radius" "190"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "35"
-"respawntimejitter" "10"
+"classname" "item_strength"
+"origin" "318.000000 -826.000000 -62.000000"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "524.000122 -539.999878 -64.000000"
+"origin" "-68.000000 -212.000183 -256.000000"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11894,11 +11851,3 @@ trak5x/base-pipe1d
 "respawntime" "35"
 "respawntimejitter" "10"
 }
-{
-"classname" "item_shells"
-"origin" "-436.000000 -824.000000 -64.000000"
-}
-{
-"classname" "item_strength"
-"origin" "318.000000 -826.000000 -62.000000"
-}

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 6480c33d8073db89541f3ca2c83897b1be9a8822..8107138a087e0f52935b37d8feab21dbedfc9128 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -light + -gamma 0.75 -dirtscale 2 -bounce 8  -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
 -minimap +
 -sRGB
-Version: 13g
+Version: 13h

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index 58e6efde66d73bfcdca42df5c61f5548c6bdfc10..41f48ca56d1161d7764094c81a140283d58e1cc7 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -36376,7 +36376,7 @@ effects_healpod/healpod1_d
 "classname" "onslaught_controlpoint"
 "origin" "-80.000000 -208.000000 0.000000"
 "targetname" "redcp1"
-"message" "Big Red room"
+"message" "Big Blue room"
 "angle" "-90.000000"
 }
 {

diff --git a/maps/runningmanctf.map.options b/maps/runningmanctf.map.options
index 50cd06bf315b4e08b66b45d83fc55b4440b0732f..8dde173f3edc657f69ce768ed6c6f547deaeec62 100644 (file)
--- a/maps/runningmanctf.map.options
+++ b/maps/runningmanctf.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 10e
+Version: 10f