Merge remote branch 'origin/master' into fruitiex/racefixes

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

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

diff --cc qcsrc/server/cl_client.qc
index a5ec05c02fb6b75ac690f03a5b8663076d0e2e4d,bb2b753b84369a3d87907d307885b0e44b94bcbf..76f81c8d7497080cc9ea3a3171631d42f824d859
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1305,25 -1305,14 +1305,30 @@@ void ClientKill_TeamChange (float targe
  
  void ClientKill (void)
  {
-       ClientKill_TeamChange(0);
+       if((g_arena || g_ca) && ((champion && champion.classname == "player" && player_count > 1) || player_count == 1)) // don't allow a kill in this case either
+       {
+               // do nothing
+       }
+       else
+               ClientKill_TeamChange(0);
  }
  
 +void CTS_ClientKill_Think (void)
 +{
 +      self = self.owner; // set self to the player to be killed
 +      sprint(self, "^1You were killed in order to prevent cheating!");
 +      ClientKill_Now();
 +}
 +
 +void CTS_ClientKill (float t) // silent version of ClientKill
 +{
 +      entity e;
 +      e = spawn();
 +      e.owner = self;
 +      e.think = CTS_ClientKill_Think;
 +      e.nextthink = t;
 +}
 +
  void DoTeamChange(float destteam)
  {
        float t, c0;

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

diff --cc qcsrc/server/defs.qh
Simple merge

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