Merge remote branch 'origin/master' into terencehill/newpanelhud-dom_points

Conflicts:
	qcsrc/client/hud.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/hud.qc
index 23405fef6e4107ea5c2ae85b93b170082d8b2e43,7ce1a202d6c9991b5e4d70e11e57796f8e496a98..f7ff56060b00bdccdd40908737ab9933e0a23258
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -4452,7 -4386,7 +4486,7 @@@ void HUD_ModIcons(void
        if(!autocvar_hud_panel_modicons && !autocvar__hud_configure)
                return;
  
-       if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_DOMINATION && !autocvar__hud_configure)
 -      if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure)
++      if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_DOMINATION && !autocvar__hud_configure)
                return;
  
        active_panel = HUD_PANEL_MODICONS;
@@@ -4489,8 -4423,8 +4523,10 @@@
                HUD_Mod_NexBall(pos, mySize);
        else if(gametype == GAME_CTS || gametype == GAME_RACE)
                HUD_Mod_Race(pos, mySize);
 +      else if(gametype == GAME_DOMINATION)
 +              HUD_Mod_Dom(pos, mySize);
+       else if(gametype == GAME_CA)
+               HUD_Mod_CA(pos, mySize);
  }
  
  // Draw pressed keys (#11)

diff --cc qcsrc/common/constants.qh
index 417526e78ea9d2b64d18522bc4a57162c9bbb5a1,b4b92ff8bd2e72cc41cc07b01bf8a339eb9e1006..3f96e9a24ac1c8ef28a4790b90da17df3df79ed0
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -310,13 -310,8 +310,14 @@@ const float STAT_SHOTORG = 46; // compr
  const float STAT_LEADLIMIT = 47;
  const float STAT_BULLETS_LOADED = 48;
  const float STAT_NEX_CHARGE = 49;
+ const float STAT_HUD = 50;
  
 +const float STAT_DOM_TOTAL_PPS = 70;
 +const float STAT_DOM_PPS_RED = 71;
 +const float STAT_DOM_PPS_BLUE = 72;
 +const float STAT_DOM_PPS_PINK = 73;
 +const float STAT_DOM_PPS_YELLOW = 74;
 +
  // see DP source, quakedef.h
  const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222;
  const float STAT_MOVEVARS_AIRSTRAFEACCEL_QW = 223;

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