From: z411 <z411@omaera.org>
Date: Thu, 30 Jun 2022 23:30:38 +0000 (-0400)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77d27c7418af029163646cbf02b2ce31c7d213f7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/bai-server
---

77d27c7418af029163646cbf02b2ce31c7d213f7
diff --cc gamemodes-client.cfg
index 31950fad7,71d272a17..75f559e08
--- a/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_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 "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
+ alias cl_hook_gameend
  alias cl_hook_shutdown
  alias cl_hook_activeweapon
diff --cc qcsrc/client/announcer.qc
index 7ff4602b2,d46595e87..3eebd0e54
--- a/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/timer.qc
index c0a3ece24,68e7312c7..c3862c010
--- a/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/server/world.qc
index f0e98b657,41c9705da..e3c05c451
--- a/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: