From: terencehill <piuntn@gmail.com>
Date: Wed, 5 Oct 2016 14:03:37 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/overkill_stuff
X-Git-Tag: xonotic-v0.8.2~553^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc9bf4e6a0c2aa4e8e3fcce7f045d97be58c425d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/overkill_stuff
---

fc9bf4e6a0c2aa4e8e3fcce7f045d97be58c425d
diff --cc qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
index f41839559,89fdfaf9e..a83474998
--- a/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
+++ b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
@@@ -1,8 -1,8 +1,8 @@@
  #include "sv_melee_only.qh"
  
 -REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !g_nexball);
 +REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !cvar("g_overkill") && !g_nexball);
  
- MUTATOR_HOOKFUNCTION(melee_only, SetStartItems)
+ MUTATOR_HOOKFUNCTION(melee_only, SetStartItems, CBC_ORDER_LAST)
  {
  	start_ammo_shells = warmup_start_ammo_shells = 0;
  	start_weapons = warmup_start_weapons = WEPSET(SHOTGUN);