Merge branch 'master' into z411/team_queue

diff --cc notifications.cfg
index da5dd289ecf7f0aa7105fc4084f5daf0b2db35a1,22a4e70a31403caeaef852e66b96d1c74ae9f011..6983630ef518585f005dd1a0ae589dd5f159e4e6
--- 1/notifications.cfg
--- 2/notifications.cfg
+++ b/notifications.cfg
@@@ -260,7 -261,7 +263,8 @@@ seta notification_INFO_QUIT_DISCONNECT 
  seta notification_INFO_QUIT_KICK_IDLING "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  seta notification_INFO_QUIT_KICK_SPECTATING "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  seta notification_INFO_QUIT_KICK_TEAMKILL "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+ seta notification_INFO_QUIT_PLAYBAN_TEAMKILL "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 +seta notification_INFO_QUIT_QUEUE "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  seta notification_INFO_QUIT_SPECTATE "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  seta notification_INFO_RACE_ABANDONED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  seta notification_INFO_RACE_FAIL_RANKED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
@@@ -477,9 -480,9 +483,10 @@@ seta notification_CENTER_ITEM_WEAPON_NO
  seta notification_CENTER_ITEM_WEAPON_PRIMORSEC "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_ITEM_WEAPON_UNAVAILABLE "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_JOIN_NOSPAWNS "1" "0 = off, 1 = centerprint"
+ seta notification_CENTER_JOIN_PLAYBAN "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_JOIN_PREVENT "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_JOIN_PREVENT_MINIGAME "1" "0 = off, 1 = centerprint"
 +seta notification_CENTER_JOIN_PREVENT_QUEUE "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_KEEPAWAY_DROPPED "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_KEEPAWAY_PICKUP "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_KEEPAWAY_PICKUP_SELF "1" "0 = off, 1 = centerprint"

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

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

diff --cc qcsrc/common/notifications/all.inc
index bb229d0d3cae03573c05dd7a7d2d9732ddce556e,effed26d98f90084dd53d1afb8da23e5db5664a5..b854c04a1ca9c518902de8dc89455ad7185767a7
--- 1/qcsrc/common/notifications/all.inc
--- 2/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@@ -422,11 -424,10 +425,12 @@@ string multiteam_info_sprintf(string in
      MSG_INFO_NOTIF(QUIT_DISCONNECT,                         N_CHATCON,  1, 0, "s1", "",         "",             _("^BG%s^F3 disconnected"), "")
      MSG_INFO_NOTIF(QUIT_KICK_IDLING,                        N_CHATCON,  1, 1, "s1 f1", "",      "",             _("^BG%s^F3 was kicked after idling for %s seconds"), "")
      MSG_INFO_NOTIF(MOVETOSPEC_IDLING,                       N_CHATCON,  1, 1, "s1 f1", "",      "",             _("^BG%s^F3 was moved to^BG spectators^F3 after idling for %s seconds"), "")
 +    MSG_INFO_NOTIF(MOVETOSPEC_REMOVE,                       N_CHATCON,  1, 0, "s1", "",         "",             _("^BG%s^F3 was moved to^BG spectators^F3 for balance reasons"), "")
      MSG_INFO_NOTIF(QUIT_KICK_SPECTATING,                    N_CONSOLE,  0, 0, "", "",           "",             _("^F2You were kicked from the server because you are a spectator and spectators aren't allowed at the moment."), "")
      MSG_INFO_NOTIF(QUIT_KICK_TEAMKILL,                      N_CHATCON,  1, 0, "s1", "",         "",             _("^BG%s^F3 was kicked for excessive teamkilling"), "")
+     MSG_INFO_NOTIF(QUIT_PLAYBAN_TEAMKILL,                   N_CHATCON,  1, 0, "s1", "",         "",             _("^BG%s^F3 was forced to spectate for excessive teamkilling"), "")
      MSG_INFO_NOTIF(QUIT_SPECTATE,                           N_CHATCON,  1, 0, "s1", "",         "",             _("^BG%s^F3 is now^BG spectating"), "")
 +    MSG_INFO_NOTIF(QUIT_QUEUE,                              N_CHATCON,  1, 0, "s1", "",         "",             _("^BG%s^F3 has left the queue"), "")
  
      MSG_INFO_NOTIF(RACE_ABANDONED,                          N_CONSOLE,  1, 0, "s1", "",                                                                     "",                         _("^BG%s^BG has abandoned the race"), "")
      MSG_INFO_NOTIF(RACE_FAIL_RANKED,                        N_CONSOLE,  1, 3, "s1 race_col f1ord race_col f3race_time race_diff", "s1 f3race_time",         "race_newfail",             _("^BG%s^BG couldn't break their %s%s^BG place record of %s%s %s"), "")

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 xonotic-server.cfg
Simple merge