Merge branch 'master' into Mario/combined_updates

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/common/weapons/w_shockwave.qc
Simple merge

diff --cc qcsrc/server/command/cmd.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_overkill.qc
index 136caf6681a2174cc26dffa9fcb81e06d867d312,6818b456486bf3bec2e43e8cb3868c3d57329eed..75e13fdea42e2d352cd959efa85a49e901389f1a
--- 1/qcsrc/server/mutators/mutator_overkill.qc
--- 2/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@@ -64,8 -64,9 +64,9 @@@ MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Sp
  MUTATOR_HOOKFUNCTION(ok_PlayerDies)
  {
        entity oldself = self;
+       entity targ = ((frag_attacker) ? frag_attacker : frag_target);
  
 -      if(self.flags & FL_MONSTER)
 +      if(IS_MONSTER(self))
        {
                remove(other); // remove default item
                other = world;

diff --cc qcsrc/warpzonelib/server.qc
Simple merge

diff --cc qcsrc/warpzonelib/util_server.qc
Simple merge