Merge remote-tracking branch 'origin/debugger/dance'

diff --git a/maps/dance.map b/maps/dance.map
index 91bee36e71c3968adbeb65d6c7e6d5ad3f85ba37..4d770d6cf7292ad995f862ba42cbc2e9e5e76a17 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -19846,78 +19846,6 @@ effects_jumppad/jumppadfx1_a
 ( 904 -1592 -64 ) ( 896 -1600 -64 ) ( 904 -1592 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 1124 752 137 ) ( 1124 720 137 ) ( 1092 752 137 ) common/weapclip 240 192 0 0.25 0.25 134217728 0 0
-( 1124 752 94 ) ( 1092 752 94 ) ( 1124 752 92 ) common/weapclip 240 112 0 0.25 0.25 134217728 0 0
-( 1124 752 94 ) ( 1124 752 92 ) ( 1124 720 94 ) common/weapclip 64 112 0 0.25 0.25 134217728 0 0
-( 1092 720 92 ) ( 1124 720 92 ) ( 1092 752 92 ) common/weapclip 240 192 0 0.25 0.25 134217728 0 0
-( 1092 720 92 ) ( 1092 720 94 ) ( 1124 720 92 ) common/weapclip 240 112 0 0.25 0.25 134217728 0 0
-( 1092 720 92 ) ( 1092 752 92 ) ( 1092 720 94 ) common/weapclip 64 112 0 0.25 0.25 134217728 0 0
-( 1092 742 -36 ) ( 1102 752 -36 ) ( 1092 742 92 ) common/weapclip 64 112 0 0.25 0.25 134217728 0 0
-( 1114 752 -36 ) ( 1124 742 -36 ) ( 1114 752 92 ) common/weapclip 64 112 0 0.25 0.25 134217728 0 0
-( 1124 730 -36 ) ( 1114 720 -36 ) ( 1124 730 92 ) common/weapclip 64 112 0 0.25 0.25 134217728 0 0
-( 1102 720 -36 ) ( 1092 730 -36 ) ( 1102 720 92 ) common/weapclip 64 112 0 0.25 0.25 134217728 0 0
-}
-{
-( 1068 768 137 ) ( 1068 736 137 ) ( 1036 768 137 ) common/weapclip 208 0 0 0.25 0.25 134217728 0 0
-( 1068 768 94 ) ( 1036 768 94 ) ( 1068 768 92 ) common/weapclip 208 112 0 0.25 0.25 134217728 0 0
-( 1068 768 94 ) ( 1068 768 92 ) ( 1068 736 94 ) common/weapclip 0 112 0 0.25 0.25 134217728 0 0
-( 1036 736 92 ) ( 1068 736 92 ) ( 1036 768 92 ) common/weapclip 208 0 0 0.25 0.25 134217728 0 0
-( 1036 736 92 ) ( 1036 736 94 ) ( 1068 736 92 ) common/weapclip 208 112 0 0.25 0.25 134217728 0 0
-( 1036 736 92 ) ( 1036 768 92 ) ( 1036 736 94 ) common/weapclip 0 112 0 0.25 0.25 134217728 0 0
-( 1036 758 -36 ) ( 1046 768 -36 ) ( 1036 758 92 ) common/weapclip 0 112 0 0.25 0.25 134217728 0 0
-( 1058 768 -36 ) ( 1068 758 -36 ) ( 1058 768 92 ) common/weapclip 0 112 0 0.25 0.25 134217728 0 0
-( 1068 746 -36 ) ( 1058 736 -36 ) ( 1068 746 92 ) common/weapclip 0 112 0 0.25 0.25 134217728 0 0
-( 1046 736 -36 ) ( 1036 746 -36 ) ( 1046 736 92 ) common/weapclip 0 112 0 0.25 0.25 134217728 0 0
-}
-{
-( 1104 663 92 ) ( 1072 663 92 ) ( 1104 663 124 ) common/weapclip 240 64 -90 0.25 0.25 134217728 0 0
-( 1104 706 92 ) ( 1104 706 124 ) ( 1104 708 92 ) common/weapclip 240 240 -90 0.25 -0.25 134217728 0 0
-( 1104 706 92 ) ( 1104 708 92 ) ( 1072 706 92 ) common/weapclip 192 240 -0 0.25 -0.25 134217728 0 0
-( 1072 708 124 ) ( 1072 708 92 ) ( 1104 708 124 ) common/weapclip 240 64 -90 0.25 0.25 134217728 0 0
-( 1072 708 124 ) ( 1072 706 124 ) ( 1072 708 92 ) common/weapclip 240 240 -90 0.25 -0.25 134217728 0 0
-( 1072 708 124 ) ( 1104 708 124 ) ( 1072 706 124 ) common/weapclip 192 240 -0 0.25 -0.25 134217728 0 0
-( 1094 836 124 ) ( 1104 836 114 ) ( 1094 708 124 ) common/weapclip 192 240 -0 0.25 -0.25 134217728 0 0
-( 1104 836 102 ) ( 1094 836 92 ) ( 1104 708 102 ) common/weapclip 192 240 -0 0.25 -0.25 134217728 0 0
-( 1082 836 92 ) ( 1072 836 102 ) ( 1082 708 92 ) common/weapclip 192 240 -0 0.25 -0.25 134217728 0 0
-( 1072 836 114 ) ( 1082 836 124 ) ( 1072 708 114 ) common/weapclip 192 240 -0 0.25 -0.25 134217728 0 0
-}
-{
-( -1124 -752 137 ) ( -1124 -720 137 ) ( -1092 -752 137 ) common/weapclip 240 192 180 0.25 0.25 134217728 0 0
-( -1124 -752 94 ) ( -1092 -752 94 ) ( -1124 -752 92 ) common/weapclip 240 112 0 -0.25 0.25 134217728 0 0
-( -1124 -752 94 ) ( -1124 -752 92 ) ( -1124 -720 94 ) common/weapclip 64 112 0 -0.25 0.25 134217728 0 0
-( -1092 -720 92 ) ( -1124 -720 92 ) ( -1092 -752 92 ) common/weapclip 240 192 180 0.25 0.25 134217728 0 0
-( -1092 -720 92 ) ( -1092 -720 94 ) ( -1124 -720 92 ) common/weapclip 240 112 0 -0.25 0.25 134217728 0 0
-( -1092 -720 92 ) ( -1092 -752 92 ) ( -1092 -720 94 ) common/weapclip 64 112 0 -0.25 0.25 134217728 0 0
-( -1092 -742 -36 ) ( -1102 -752 -36 ) ( -1092 -742 92 ) common/weapclip 64 112 0 -0.25 0.25 134217728 0 0
-( -1114 -752 -36 ) ( -1124 -742 -36 ) ( -1114 -752 92 ) common/weapclip 64 112 0 -0.25 0.25 134217728 0 0
-( -1124 -730 -36 ) ( -1114 -720 -36 ) ( -1124 -730 92 ) common/weapclip 64 112 0 -0.25 0.25 134217728 0 0
-( -1102 -720 -36 ) ( -1092 -730 -36 ) ( -1102 -720 92 ) common/weapclip 64 112 0 -0.25 0.25 134217728 0 0
-}
-{
-( -1068 -768 137 ) ( -1068 -736 137 ) ( -1036 -768 137 ) common/weapclip 208 0 180 0.25 0.25 134217728 0 0
-( -1068 -768 94 ) ( -1036 -768 94 ) ( -1068 -768 92 ) common/weapclip 208 112 0 -0.25 0.25 134217728 0 0
-( -1068 -768 94 ) ( -1068 -768 92 ) ( -1068 -736 94 ) common/weapclip 0 112 0 -0.25 0.25 134217728 0 0
-( -1036 -736 92 ) ( -1068 -736 92 ) ( -1036 -768 92 ) common/weapclip 208 0 180 0.25 0.25 134217728 0 0
-( -1036 -736 92 ) ( -1036 -736 94 ) ( -1068 -736 92 ) common/weapclip 208 112 0 -0.25 0.25 134217728 0 0
-( -1036 -736 92 ) ( -1036 -768 92 ) ( -1036 -736 94 ) common/weapclip 0 112 0 -0.25 0.25 134217728 0 0
-( -1036 -758 -36 ) ( -1046 -768 -36 ) ( -1036 -758 92 ) common/weapclip 0 112 0 -0.25 0.25 134217728 0 0
-( -1058 -768 -36 ) ( -1068 -758 -36 ) ( -1058 -768 92 ) common/weapclip 0 112 0 -0.25 0.25 134217728 0 0
-( -1068 -746 -36 ) ( -1058 -736 -36 ) ( -1068 -746 92 ) common/weapclip 0 112 0 -0.25 0.25 134217728 0 0
-( -1046 -736 -36 ) ( -1036 -746 -36 ) ( -1046 -736 92 ) common/weapclip 0 112 0 -0.25 0.25 134217728 0 0
-}
-{
-( -1104 -663 92 ) ( -1072 -663 92 ) ( -1104 -663 124 ) common/weapclip 240 64 -90 0.25 -0.25 134217728 0 0
-( -1104 -706 92 ) ( -1104 -706 124 ) ( -1104 -708 92 ) common/weapclip 240 240 -90 0.25 0.25 134217728 0 0
-( -1104 -706 92 ) ( -1104 -708 92 ) ( -1072 -706 92 ) common/weapclip 192 240 0 -0.25 0.25 134217728 0 0
-( -1072 -708 124 ) ( -1072 -708 92 ) ( -1104 -708 124 ) common/weapclip 240 64 -90 0.25 -0.25 134217728 0 0
-( -1072 -708 124 ) ( -1072 -706 124 ) ( -1072 -708 92 ) common/weapclip 240 240 -90 0.25 0.25 134217728 0 0
-( -1072 -708 124 ) ( -1104 -708 124 ) ( -1072 -706 124 ) common/weapclip 192 240 0 -0.25 0.25 134217728 0 0
-( -1094 -836 124 ) ( -1104 -836 114 ) ( -1094 -708 124 ) common/weapclip 192 240 0 -0.25 0.25 134217728 0 0
-( -1104 -836 102 ) ( -1094 -836 92 ) ( -1104 -708 102 ) common/weapclip 192 240 0 -0.25 0.25 134217728 0 0
-( -1082 -836 92 ) ( -1072 -836 102 ) ( -1082 -708 92 ) common/weapclip 192 240 0 -0.25 0.25 134217728 0 0
-( -1072 -836 114 ) ( -1082 -836 124 ) ( -1072 -708 114 ) common/weapclip 192 240 0 -0.25 0.25 134217728 0 0
-}
-{
 ( -1536 96 -256 ) ( -1536 32 -256 ) ( -1664 96 -256 ) exx/panel-metal01c 349.0908203125 302.5454101563 0 0.171875 0.171875 0 0 0
 ( -1664 160 -272 ) ( -1664 32 -272 ) ( -1536 160 -272 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
 ( -1556 32 -256 ) ( -1556 160 -256 ) ( -1556 32 -272 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
@@ -22447,24 +22375,6 @@ effects_jumppad/jumppadfx1_a
 "_receiveshadows" "1"
 }
 {
-"classname" "misc_model"
-"origin" "1451.000244 699.000061 91.999985"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angle" "63.469696"
-}
-{
-"classname" "misc_model"
-"origin" "1422.999878 732.000183 91.999985"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angle" "-124.644928"
-}
-{
 "classname" "misc_gamemodel"
 "origin" "1418.000000 -2370.000000 -324.000000"
 "model" "models/containers/crate01.md3"
@@ -23904,24 +23814,6 @@ effects_jumppad/jumppadfx1_a
 "_receiveshadows" "1"
 }
 {
-"classname" "misc_model"
-"origin" "-1450.999512 -699.000000 91.999985"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angle" "-116.530312"
-}
-{
-"classname" "misc_model"
-"origin" "-1422.999634 -732.000244 91.999985"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angle" "55.355072"
-}
-{
 "classname" "misc_gamemodel"
 "origin" "-1418.000122 2370.000000 -323.999969"
 "model" "models/containers/crate01.md3"
@@ -24817,3 +24709,103 @@ effects_jumppad/jumppadfx1_a
 "targetname" "target_position192"
 "angle" "90.000000"
 }
+{
+"classname" "misc_breakablemodel"
+"origin" "-1420.000000 -736.000000 92.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "-120.000015"
+"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" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"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" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "-1452.000000 -696.000000 92.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "-120.000015"
+"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" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"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" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "1419.999878 736.000122 92.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"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" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"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" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "1452.000000 695.999939 92.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"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" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"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" "40"
+"respawntimejitter" "10"
+}

diff --git a/maps/dance.map.options b/maps/dance.map.options
index cdf410326275f977a54d97cea090db691cf786d6..a1c84cbef70de295066f690b1f3fa0f147968d29 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 4
+Version: 5