Merge branch 'master' into terencehill/scoreboard_item_stats

diff --cc _hud_common.cfg
index 29c41803f11dcd69647dc4f036ce5eb70ff68604,4973ef0bc008d88d2dc1e1f6dda768c30c451961..9719c9dbee806e29f7979b4adad73549d7d19cda
--- 1/_hud_common.cfg
--- 2/_hud_common.cfg
+++ b/_hud_common.cfg
@@@ -120,7 -120,9 +121,10 @@@ seta hud_panel_scoreboard_others_showsc
  seta hud_panel_scoreboard_spectators_showping 1 "show ping of spectators"
  seta hud_panel_scoreboard_spectators_aligned 0 "align spectators in columns"
  seta hud_panel_scoreboard_minwidth 0.6 "minimum width of the scoreboard"
 +seta hud_panel_scoreboard_team_size_position 0 "where to show the team size (0 = do not show, 1 = left of scoreboard, 2 = right of scoreboard), will move team scores to the other side if necessary"
+ seta hud_panel_scoreboard_playerid 0 "show player id (server entity number) next to player's name"
+ seta hud_panel_scoreboard_playerid_prefix "#" "player id prefix"
+ seta hud_panel_scoreboard_playerid_suffix " " "player id suffix"
  
  seta hud_panel_scoreboard_accuracy_showdelay 2 "how long to delay displaying accuracy below the scoreboard if it's too far down"
  seta hud_panel_scoreboard_accuracy_showdelay_minpos 0.75 "delay displaying the accuracy panel only if its position is lower than this percentage of the screen height from the top"

diff --cc _hud_descriptions.cfg
Simple merge

diff --cc hud_luma.cfg
Simple merge

diff --cc hud_luminos.cfg
Simple merge

diff --cc hud_luminos_minimal.cfg
Simple merge

diff --cc hud_luminos_minimal_xhair.cfg
Simple merge

diff --cc hud_luminos_old.cfg
Simple merge

diff --cc hud_nexuiz.cfg
Simple merge

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

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