Merge branch 'master' of ssh://git.xonotic.org/xonotic

diff --git a/all b/all
index c1da7075411b58ce3ade3f895d4d8d00e8076adf..b4f38b8849dfba794ab5bfdf8bb6cae663aae3c5 100755 (executable)
--- a/all
+++ b/all
@@ -117,7 +117,7 @@ data/xonotic-nexcompat.pk3dir |
 mediasource                   |                                                   | master      |
 darkplaces                    |                                                   | div0-stable | svn
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
-div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
+div0-gittools                 |                                                   | master      |
 netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable

diff --git a/misc/tools/WeaponEncounterProfile.pm b/misc/tools/WeaponEncounterProfile.pm
index 52766ea13e01cc84e05f6c63cccf1647c2138b83..68acfb23bcc5e8b1699c5a81a8ccec2e3064825a 100644 (file)
--- a/misc/tools/WeaponEncounterProfile.pm
+++ b/misc/tools/WeaponEncounterProfile.pm
@@ -114,6 +114,7 @@ our %WeaponMap = (
         14 => ["Tuba", "tuba"],
         15 => ["Camping Rifle", "campingrifle"],
         16 => ["Fireball", "fireball"],
+        17 => ["Seeker", "seeker"],
 );
 
 sub weaponid_valid($$)