From: z411 <z411@omaera.org>
Date: Fri, 23 Apr 2021 19:47:36 +0000 (-0400)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=702897c90862a43239b417cca503bf2c6d5089a3;p=xonotic%2Fxonotic-data.pk3dir.git

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

702897c90862a43239b417cca503bf2c6d5089a3
diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 8233229ab,985796044..fb1ae0569
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -446,9 -436,16 +446,16 @@@ void Cmd_Scoreboard_SetFields(int argc
  				cvar_set("scoreboard_columns", SCOREBOARD_DEFAULT_COLUMNS);
  			argc = tokenizebyseparator(strcat("0 1 ", SCOREBOARD_DEFAULT_COLUMNS), " ");
  		}
- 		else if(argv(2) == "all")
+ 		else if(argv(2) == "all" || argv(2) == "ALL")
  		{
- 			string s = "ping pl cn name |"; // scores without a label
 -			string s = "ping pl name |"; // scores without label (not really scores)
++			string s = "ping pl cn name |"; // scores without label (not really scores)
+ 			if(argv(2) == "ALL")
+ 			{
+ 				// scores without label
+ 				s = strcat(s, " ", "sum");
+ 				s = strcat(s, " ", "kdratio");
+ 				s = strcat(s, " ", "frags");
+ 			}
  			FOREACH(Scores, true, {
  				if(it != ps_primary)
  				if(it != ps_secondary)
diff --cc qcsrc/common/notifications/all.qh
index 999ba8e55,babadf8c8..809c1fc92
--- a/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.qh
@@@ -38,7 -36,7 +38,8 @@@ string Get_Notif_TypeName(MSG net_type
  		case MSG_CENTER: return "MSG_CENTER";
  		case MSG_MULTI: return "MSG_MULTI";
  		case MSG_CHOICE: return "MSG_CHOICE";
 +		case MSG_MEDAL: return "MSG_MEDAL";
+ 		case MSG_CENTER_KILL: return "MSG_CENTER_KILL";
  	}
  	LOG_WARNF("Get_Notif_TypeName(%d): Improper net type!", ORDINAL(net_type));
  	return "";
diff --cc qcsrc/server/damage.qc
index 3998467a5,7e052de04..c695d6ad2
--- a/qcsrc/server/damage.qc
+++ b/qcsrc/server/damage.qc
@@@ -300,13 -280,15 +300,15 @@@ void Obituary(entity attacker, entity i
  				{
  					case DEATH_MIRRORDAMAGE:
  					{
 -						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);
 +						Obituary_SpecialDeath(targ, NULL, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);
  						break;
  					}
- 
+ 					case DEATH_HURTTRIGGER:
+ 						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, inflictor.message, deathlocation, CS(targ).killcount, 0, 0);
+ 						break;
  					default:
  					{
 -						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);
 +						Obituary_SpecialDeath(targ, NULL, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);
  						break;
  					}
  				}