Merge branch 'master' into z411/bai-server

diff --cc gamemodes-client.cfg
index 31950fad75bc87b5408b7064e93f68957ead3331,71d272a174e7c50dcb868fa34e472d043668a250..75f559e08d26baa1ae90a27907931348452ed4fb
--- 1/gamemodes-client.cfg
--- 2/gamemodes-client.cfg
+++ b/gamemodes-client.cfg
@@@ -32,9 -32,6 +32,9 @@@ alias cl_hook_gamestart_k
  alias cl_hook_gamestart_ft
  alias cl_hook_gamestart_inv
  alias cl_hook_gamestart_duel
- alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
 +alias cl_hook_gamestart_mmm //LegendGuard adds mmm client hook for MMM 20-02-2021
 +alias cl_hook_gamestart_mayhem
 +alias cl_hook_gamestart_tmayhem
+ alias cl_hook_gameend
  alias cl_hook_shutdown
  alias cl_hook_activeweapon

diff --cc gamemodes-server.cfg
Simple merge

diff --cc notifications.cfg
Simple merge

diff --cc qcsrc/client/announcer.qc
index 7ff4602b2ab2c110376f35179b84fd3269b68d84,d46595e8718bde0a2007fb276a6e54ab6b49d7ca..3eebd0e54fdc8fe957b4dfba08f6027ace26f9c2
--- 1/qcsrc/client/announcer.qc
--- 2/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@@ -72,8 -72,9 +74,10 @@@ void Announcer_Countdown(entity this
        float countdown = (inround ? roundstarttime - time : starttime - time);
        float countdown_rounded = floor(0.5 + countdown);
  
-       if(time >= starttime) centerprint_ClearTitle();
-       
++      if (time >= starttime) centerprint_ClearTitle();
+       if (starttime != prev_starttime || roundstarttime != prev_roundstarttime || prev_inround != inround)
+               this.skin = 0; // restart centerprint countdown
+ 
        if(countdown <= 0) // countdown has finished, starttime is now
        {
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);

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

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

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

diff --cc qcsrc/client/hud/panel/timer.qc
index c0a3ece2423516c832f5ee3cd4d2337cb5ef43b8,68e7312c7a5ba881ee1f45a000e91f64219ea7fb..c3862c0102ea07c03f085c5da7600c8f9d4b790f
--- 1/qcsrc/client/hud/panel/timer.qc
--- 2/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@@ -175,12 -132,12 +175,10 @@@ void HUD_Timer(
                subtext = _("Warmup");
        else if(STAT(TIMEOUT_STATUS) == 2)
                subtext = _("Timeout");
--      else if (overtimes == -1)
--              subtext = _("Sudden Death");
--      else if(overtimes == 1)
--              subtext = _("Overtime");
--      else if (overtimes >= 2)
++      else if(overtimes >= 2)
                subtext = sprintf(_("Overtime #%d"), overtimes);
++      else if(overtimes != 0)
++              subtext = _("Overtime");
  
        subtext_size  = vec2(mySize.x, mySize.y / 3);
        timer_size    = vec2(mySize.x, mySize.y - subtext_size.y);

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

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

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/race/sv_race.qc
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

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

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

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

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

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

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

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

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

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

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

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

diff --cc qcsrc/server/mutators/events.qh
Simple merge

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

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

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

diff --cc qcsrc/server/world.qc
index f0e98b657c9b67172088fa1deef8a71ac3605912,41c9705da06f510026176c49d70f787505ad95fa..e3c05c451e5f7168d9db3c39cb5588cb87aff8ed
--- 1/qcsrc/server/world.qc
--- 2/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@@ -461,8 -412,7 +457,9 @@@ void cvar_changes_init(
                BADPREFIX("sv_timeout_");
                BADPREFIX("sv_vote_");
                BADPREFIX("timelimit_");
 +              BADPREFIX("sv_chat_");
 +              BADPREFIX("sv_jingle_");
+               BADPRESUFFIX("g_", "_round_timelimit");
  
                // allowed changes to server admins (please sync this to server.cfg)
                // vi commands:

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