From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sun, 8 Feb 2015 12:14:15 +0000 (+0100)
Subject: Merge branch 'master' into matthiaskrgr/dance
X-Git-Tag: xonotic-v0.8.1~17^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=669be3c7907566f69860275eda8c07ae46d5f84d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/dance
---

669be3c7907566f69860275eda8c07ae46d5f84d
diff --cc maps/dance.map
index 6a18b42b,c5ae6475..660e154e
--- a/maps/dance.map
+++ b/maps/dance.map
@@@ -24194,534 -24714,6 +24714,534 @@@ effects_jumppad/jumppadfx1_
  "message" "was killed by an explosive barrel"
  "message2" "was killed with an explosive barrel by"
  "noise" "sound/weapons/rocket_impact.ogg"
- "respawntime" "40"
+ "respawntime" "35"
  "respawntimejitter" "10"
  }
 +{
 +"classname" "light"
 +"origin" "1600.000000 -1426.000000 -17.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -1390.000000 -17.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1280.000000 -1042.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "1280.000000 -1006.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "1006.000000 -768.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "1042.000000 -768.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "1042.000000 -1280.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "1006.000000 -1280.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "768.000000 -1042.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "768.000000 -1006.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "736.000000 -1518.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "736.000000 -1554.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "128.000000 -594.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "128.000000 -978.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "736.000000 -2322.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "736.000000 -1938.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "288.000000 -1554.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "288.000000 -2322.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "288.000000 -1938.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1280.000000 1006.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-128.000000 558.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-768.000000 1006.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-736.000000 1518.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-128.000000 942.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-736.000000 2286.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-736.000000 1902.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-288.000000 1518.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-288.000000 2286.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-288.000000 1902.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "128.000000 -557.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "128.000000 -941.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "736.000000 -2285.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "736.000000 -1901.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "288.000000 -1517.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "288.000000 -2285.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "288.000000 -1901.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1280.000000 1043.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-128.000000 595.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-768.000000 1043.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-736.000000 1555.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-128.000000 979.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-736.000000 2323.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-736.000000 1939.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-288.000000 1555.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-288.000000 2323.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-288.000000 1939.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1006.000000 768.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1042.000000 768.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1042.000000 1280.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1006.000000 1280.000000 -18.000000"
 +"light" "240"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 -540.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 -204.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 116.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 436.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 756.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 1076.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 1428.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 580.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 244.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -76.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -396.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -716.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -1036.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 -580.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 -244.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 76.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 396.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 716.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 1036.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1600.000000 1388.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 540.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 204.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -116.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -436.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -756.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1600.000000 -1076.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1589.000000 -908.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1611.000000 884.000000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1612.500000 -884.500000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1587.500000 907.500000 -19.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-339.000000 -896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-659.000000 -896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-979.000000 -896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1299.000000 -896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "301.000000 896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "621.000000 896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "941.000000 896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1261.000000 896.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-299.000000 -892.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-619.000000 -892.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-939.000000 -892.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "-1259.000000 -892.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "341.000000 900.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "661.000000 900.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "981.000000 900.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}
 +{
 +"classname" "light"
 +"origin" "1301.000000 900.000000 -18.000000"
 +"light" "175"
 +"_color" "1 1 0.9"
 +}