Merge branch 'master' into z411/bai-server

diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 9d973bbfa470e74e6cb89c75885be7b3be4f1b18,9965d58fb4ed257d341596517b046a33be301e48..0b788fdb1eead216f03cdd8b913f05a7595339bc
--- 1/qcsrc/client/hud/panel/scoreboard.qc
--- 2/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -99,9 -93,10 +102,12 @@@ bool autocvar_hud_panel_scoreboard_othe
  bool autocvar_hud_panel_scoreboard_spectators_showping = true;
  bool autocvar_hud_panel_scoreboard_spectators_aligned = false;
  float autocvar_hud_panel_scoreboard_minwidth = 0.4;
+ bool autocvar_hud_panel_scoreboard_playerid = false;
+ string autocvar_hud_panel_scoreboard_playerid_prefix = "#";
+ string autocvar_hud_panel_scoreboard_playerid_suffix = " ";
  
 +int average_ping[NUM_TEAMS];
 +
  // mode 0: returns translated label
  // mode 1: prints name and description of all the labels
  string Label_getInfo(string label, int mode)

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

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

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

diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
Simple merge

diff --cc qcsrc/common/notifications/all.qc
Simple merge

diff --cc qcsrc/common/notifications/all.qh
Simple merge

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

diff --cc qcsrc/common/teams.qh
index 9e3a8181faf6f80841c343312bcefe19cc1bffeb,62c3e7b162b2aa11e27962da6e49b218889cbc91..e99b001b255d676b55e5b6409e61da9def8ef435
--- 1/qcsrc/common/teams.qh
--- 2/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@@ -89,24 -83,9 +89,24 @@@ vector Team_ColorRGB(int teamid
                case NUM_TEAM_4: return '1 0.0625 1'; // 0xFF0FFF
        }
  
-     return '0 0 0';
+       return '0 0 0';
  }
  
 +#ifdef CSQC
 +string Team_CustomName(int teamid)
 +{
 +      switch(teamid)
 +      {
 +              case NUM_TEAM_1: return ((teamname_red != "") ? teamname_red : "^1RED^7 team");
 +              case NUM_TEAM_2: return ((teamname_blue != "")? teamname_blue : "^4BLUE^7 team");
 +              case NUM_TEAM_3: return ((teamname_yellow != "") ? teamname_yellow : "^3YELLOW^7 team");
 +              case NUM_TEAM_4: return ((teamname_pink != "") ? teamname_pink : "^6PINK^7 team");
 +      }
 +
 +    return NAME_NEUTRAL;
 +}
 +#endif
 +
  string Team_ColorName(int teamid)
  {
        switch(teamid)

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

diff --cc qcsrc/common/weapons/weapon/electro.qc
Simple merge

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

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

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

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

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

diff --cc qcsrc/server/weapons/accuracy.qc
index 5a6ebf6b7ad2a52c2304d8ece53be5ad0222fbd2,3eafbc76c7025f0eae0aac9e691b087e5dd77a78..e940555e309ca3913721a30bf308cc8e4a95fbaa
--- 1/qcsrc/server/weapons/accuracy.qc
--- 2/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@@ -25,15 -25,9 +25,15 @@@ bool accuracy_send(entity this, entity 
        entity a = this.owner;
        if (IS_SPEC(a)) a = a.enemy;
        a = CS(a).accuracy;
 +      
 +      // z411 send entity number
 +      if(g_duel)
 +              WriteByte(MSG_ENTITY, etof(a.owner));
 +      else
 +              WriteByte(MSG_ENTITY, 0);
  
        if (to != a.owner)
-               if (!autocvar_sv_accuracy_data_share && !CS(a.owner).cvar_cl_accuracy_data_share)
+               if (!autocvar_sv_accuracy_data_share && !CS_CVAR(a.owner).cvar_cl_accuracy_data_share)
                        sf = 0;
        // note: zero sendflags can never be sent... so we can use that to say that we send no accuracy!
        WriteInt24_t(MSG_ENTITY, sf);

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge