Merge branch 'master' into terencehill/newpanelhud-dom_points

Conflicts:
	qcsrc/server/cl_client.qc

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc qcsrc/common/constants.qh
index b2c4c53d16fd8e0f6cdc530e093f16db9f00ec8f,6f0eccfafb8af72f94a556ad5709a0554c0ccfab..417526e78ea9d2b64d18522bc4a57162c9bbb5a1
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -308,13 -309,8 +309,14 @@@ const float STAT_NB_METERSTART = 45
  const float STAT_SHOTORG = 46; // compressShotOrigin
  const float STAT_LEADLIMIT = 47;
  const float STAT_BULLETS_LOADED = 48;
+ const float STAT_NEX_CHARGE = 49;
  
 +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
index e935273c6dcc9417c40874b3d182e85bba37d1f3,df6c8d4b2a3f41e0793e271d8aae9a9b54512692..6cc10bcd6bb767d1307cb38a52d896f49e76d03e
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1386,11 -1397,6 +1397,7 @@@ Called when a client connects to the se
  string ColoredTeamName(float t);
  void DecodeLevelParms (void);
  //void dom_player_join_team(entity pl);
- #ifdef UID
- .float uid_kicktime;
- .string uid;
- #endif
 +void set_dom_state(entity e, float connecting);
  void ClientConnect (void)
  {
        float t;
@@@ -1594,11 -1594,10 +1595,12 @@@
                        race_SendRankings(i, 0, 0, MSG_ONE);
                }
        }
-       else if(cvar("sv_teamnagger") && !g_ca) // teamnagger is currently bad for ca
+       else if(cvar("sv_teamnagger") && !(cvar("bot_vs_human") && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
                send_CSQC_teamnagger();
  
 +      if (g_domination)
 +              set_dom_state(self, TRUE);
+       send_CSQC_cr_maxbullets(self);
  
        CheatInitClient();
  }

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