From: Mario <zacjardine@y7mail.com>
Date: Wed, 12 Oct 2016 14:48:10 +0000 (+0000)
Subject: Merge branch 'DefaultUser/overkill_cvars' into 'master'
X-Git-Tag: xonotic-v0.8.2~521
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00d96133efc93b60bda345031b7ba11e2cf74e37;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/overkill_cvars' into 'master'

Minor cleanup for overkill

Reuse g_pickup_respawntime_superweapon for overkill superweapons instead of g_overkill_superguns_respawn_time.
Replace poorly named cvars g_overkill_100h_anyway and g_overkill_100a_anyway.
Add cvars to filter out 25 and 50 armor for overkill

See merge request !375
---

00d96133efc93b60bda345031b7ba11e2cf74e37