Merge remote-tracking branch 'origin/master' into morosophos/server-current4

diff --cc _hud_common.cfg
Simple merge

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/scoreboard.qc
index 8b31584b51fe1546ff8ffbdf4a2b7eb51d005851,f8b302b98737ad5a6b65ebf7e7ec94eb59f1a4dc..9e21ccfda0555bce3dddaf28791fb383f63bdc2f
--- 1/qcsrc/client/hud/panel/scoreboard.qc
--- 2/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@@ -162,12 -163,9 +163,13 @@@ string Label_getInfo(string label, int 
                case "rounds":       if (!mode) return CTX(_("SCO^rounds won"));   else LOG_HELP(strcat("^3", "rounds", "             ^7", _("Number of rounds won")));
                case "rounds_pl":    if (!mode) return CTX(_("SCO^rounds played"));else LOG_HELP(strcat("^3", "rounds_pl", "          ^7", _("Number of rounds played")));
                case "score":        if (!mode) return CTX(_("SCO^score"));        else LOG_HELP(strcat("^3", "score", "              ^7", _("Total score")));
 +              case "avgspeed":     if (!mode) return CTX(_("SCO^average speed"));else LOG_HELP(strcat("^3", "avgspeed", "           ^7", _("Average speed (CTS)")));
 +              case "topspeed":     if (!mode) return CTX(_("SCO^top speed"));    else LOG_HELP(strcat("^3", "topspeed", "           ^7", _("Top speed (CTS)")));
 +              case "startspeed":   if (!mode) return CTX(_("SCO^start speed"));  else LOG_HELP(strcat("^3", "startspeed", "         ^7", _("Start speed (CTS)")));
 +              case "strafe":       if (!mode) return CTX(_("SCO^strafe"));       else LOG_HELP(strcat("^3", "strafe", "             ^7", _("Strafe efficiency (CTS)")));
                case "suicides":     if (!mode) return CTX(_("SCO^suicides"));     else LOG_HELP(strcat("^3", "suicides", "           ^7", _("Number of suicides")));
                case "sum":          if (!mode) return CTX(_("SCO^sum"));          else LOG_HELP(strcat("^3", "sum", "                ^7", _("Number of kills minus deaths")));
+               case "survivals":    if (!mode) return CTX(_("SCO^survivals"));    else LOG_HELP(strcat("^3", "survivals", "          ^7", _("Number of survivals")));
                case "takes":        if (!mode) return CTX(_("SCO^takes"));        else LOG_HELP(strcat("^3", "takes", "              ^7", _("Number of domination points taken (Domination)")));
                case "teamkills":    if (!mode) return CTX(_("SCO^teamkills"));    else LOG_HELP(strcat("^3", "teamkills", "          ^7", _("Number of teamkills")));
                case "ticks":        if (!mode) return CTX(_("SCO^ticks"));        else LOG_HELP(strcat("^3", "ticks", "              ^7", _("Number of ticks (Domination)")));
@@@ -747,9 -745,9 +749,9 @@@ void Cmd_Scoreboard_Help(
  " +ctf/pickups +ctf/fckills +ctf/returns +ctf/caps +ons/takes +ons/caps" \
  " +lms/lives +lms/rank" \
  " +kh/kckills +kh/losses +kh/caps" \
 -" ?+rc/laps ?+rc/time +rc,cts/fastest" \
 +" ?+rc/laps ?+rc/time ?+cts/strafe ?+cts/startspeed ?+cts/avgspeed ?+cts/topspeed +rc,cts/fastest" \
  " +as/objectives +nb/faults +nb/goals" \
- " +ka/pickups +ka/bckills +ka/bctime +ft/revivals" \
+ " +ka,tka/pickups +ka,tka/bckills +ka,tka/bctime +ft/revivals" \
  " +dom/ticks +dom/takes" \
  " -lms,rc,cts,inv,nb/score"
  

diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qc
Simple merge

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

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

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

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

diff --cc xonotic-server.cfg
Simple merge