Merge branch 'master' into z411/bai-server

diff --cc gamemodes-server.cfg
Simple merge

diff --cc notifications.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 8233229ab0ce9a8b8f7f15f070546f296e20a7a4,9857960440fd79f7da6361eb7ccdd1822890cff9..fb1ae05693f40c1763db7d80073af6647eb178fd
--- 1/qcsrc/client/hud/panel/scoreboard.qc
--- 2/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/client/main.qc
Simple merge

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

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
Simple merge

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

diff --cc qcsrc/common/notifications/all.qh
index 999ba8e5545a5aeade7b25cf71ed32eb22f439c2,babadf8c873272fb7a7e847e31cf2cf41a438fc1..809c1fc9217a80aabfc6f258b68e07e17c0fed62
--- 1/qcsrc/common/notifications/all.qh
--- 2/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/common/util.qc
Simple merge

diff --cc qcsrc/server/damage.qc
index 3998467a52e162209d596ed2574fef5d59982025,7e052de046ebbbd5f93dc6ef2f071b306f85623f..c695d6ad274c253134da3cecbe4625d179f7f749
--- 1/qcsrc/server/damage.qc
--- 2/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;
                                        }
                                }