]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b306a9 472af75)
Merge branch 'DefaultUser/overkill_cvars' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 12 Oct 2016 14:48:10 +0000 (14:48 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 12 Oct 2016 14:48:10 +0000 (14:48 +0000)
commit00d96133efc93b60bda345031b7ba11e2cf74e37
tree1dfb942217f61af1e39b8b73197bbf06134aafc2tree | snapshot
parent5b306a9195a8a226741cb201f7e02f9ed561311ccommit | diff
parent472af75233c97aab86a393b900b63f43979897f2commit | diff
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
mutators.cfg diff1 | diff2 | blob | history