From: LegendaryGuard <rootuser999@gmail.com>
Date: Sat, 12 Jun 2021 15:04:10 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/cyber
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b426d496c413fe4779195e7f3075e52378bb6125;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/cyber
---

b426d496c413fe4779195e7f3075e52378bb6125
diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 71b374260,2db57485b..564e39841
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -2307,9 -1837,9 +2309,9 @@@ void Scoreboard_Draw(
  
  	Scoreboard_UpdatePlayerTeams();
  
- 	float initial_pos_y = panel_pos.y;
+ 	scoreboard_top = panel_pos.y;
  	vector pos = panel_pos;
 -	entity tm;
 +	entity pl, tm;
  	string str;
  	vector str_pos;
  
diff --cc qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
index 00082fd61,6fdd693cc..87f37b532
--- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
@@@ -46,4 -46,4 +49,4 @@@ float autocvar_g_freezetag_revive_speed
  float autocvar_g_freezetag_revive_time_to_score = 1.5;
  bool autocvar_g_freezetag_revive_nade;
  float autocvar_g_freezetag_revive_nade_health;
- bool autocvar_g_freezetag_revive_respawn;
 -float autocvar_g_freezetag_revive_spawnshield = 1;
++float autocvar_g_freezetag_revive_spawnshield = 1;
diff --cc qcsrc/common/notifications/all.inc
index 2d59a6777,514440dbb..15c916b28
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@@ -655,15 -573,11 +660,13 @@@ string multiteam_info_sprintf(string in
  
      #define VERBOSE_MURDER(type) strcat(MURDER_##type, "^BG%s")
  
-     #define MURDER_FRAG             strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s"))
-     #define MURDER_FRAG2            strcat(BOLD_OPERATOR, _("^K3%sYou scored against ^BG%s"))
- 	#define MURDER_FRAG3            strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s"), "\n", "%s^BG place with %s")
- 	#define MURDER_FRAG4            strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s"), "\n", "%s^BG with %s")
-     #define MURDER_FRAGGED          _("^K1%sYou were fragged by ^BG%s")
-     #define MURDER_FRAGGED2         _("^K1%sYou were scored against by ^BG%s")
+     #define MURDER_FRAG             BOLD(_("^K3%sYou fragged ^BG%s"))
+     #define MURDER_FRAG2            BOLD(_("^K3%sYou scored against ^BG%s"))
+     #define MURDER_FRAGGED          BOLD(_("^K1%sYou were fragged by ^BG%s"))
+     #define MURDER_FRAGGED2         BOLD(_("^K1%sYou were scored against by ^BG%s"))
      MSG_CENTER_NOTIF(DEATH_MURDER_FRAG,                   N_ENABLE,  1, 1, "spree_cen s1",               CPID_Null,  "0 0",  MURDER_FRAG,                    MURDER_FRAG2                   )
 +	MSG_CENTER_NOTIF(DEATH_MURDER_DM,                     N_ENABLE,  1, 2, "spree_cen s1 frag_pos f2",   CPID_Null,  "0 0",  MURDER_FRAG3, "")
 +	MSG_CENTER_NOTIF(DEATH_MURDER_DUEL,                   N_ENABLE,  2, 2, "spree_cen s1 s2 f2",         CPID_Null,  "0 0",  MURDER_FRAG4, "")
      MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED,                N_ENABLE,  1, 1, "spree_cen s1",               CPID_Null,  "0 0",  MURDER_FRAGGED,                 MURDER_FRAGGED2                )
      MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE,        N_ENABLE,  1, 4, "spree_cen s1 frag_stats",    CPID_Null,  "0 0",  VERBOSE_MURDER(FRAGGED),        VERBOSE_MURDER(FRAGGED2)       )
      MSG_CENTER_NOTIF(DEATH_MURDER_FRAG_VERBOSE,           N_ENABLE,  1, 2, "spree_cen s1 frag_ping",     CPID_Null,  "0 0",  VERBOSE_MURDER(FRAG),           VERBOSE_MURDER(FRAG2)          )
diff --cc qcsrc/server/client.qc
index 246cd6003,d80bdffa7..1d1a9b3d4
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -1077,14 -1055,13 +1077,15 @@@ string getwelcomemessage(entity this
  		modifications = strcat(modifications, ", Powerups");
  	modifications = substring(modifications, 2, strlen(modifications) - 2);
  
 -	string versionmessage = GetClientVersionMessage(this);
 -	string s = strcat(versionmessage, "^8\n^8\nserver is ^9", autocvar_hostname, "^8\n");
 +	//string versionmessage = GetClientVersionMessage(this);
 +	//string s = strcat(versionmessage, "^8\n^9", (autocvar_hostname_full ? autocvar_hostname_full : autocvar_hostname));
++	//string s = strcat(versionmessage, "^8\n^8\nserver is ^9", autocvar_hostname, "^8\n");
 +	string s = (autocvar_hostname_full != "" ? autocvar_hostname_full : autocvar_hostname);
  
 -	s = strcat(s, "^8\nmatch type is ^1", gamemode_name, "^8\n");
 +	s = strcat(s, "^8\n^7", gamemode_name);
  
  	if(modifications != "")
 -		s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");
 +		s = strcat(s, "^7 | ^3", modifications);
  
  	if(cache_lastmutatormsg != autocvar_g_mutatormsg)
  	{