Merge branch 'master' into Mario/team_keepaway

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/common/mutators/mutator/waypoints/all.inc
index 617194fbf6d3f7659eadc5c2ca46a2765d6e4b4f,aa0ca250fdaede1d595fa6fd5f4113a022bba0d8..98b1f4d3ce8b5f78bee76adc87a0e057690ef0cd
--- 1/qcsrc/common/mutators/mutator/waypoints/all.inc
--- 2/qcsrc/common/mutators/mutator/waypoints/all.inc
+++ b/qcsrc/common/mutators/mutator/waypoints/all.inc
@@@ -47,11 -47,9 +47,13 @@@ REGISTER_WAYPOINT(KeyCarrierPink, _("Ke
  
  REGISTER_WAYPOINT(KaBall, _("Ball"), "notify_ballpickedup", '0 1 1', 1);
  REGISTER_WAYPOINT(KaBallCarrier, _("Ball carrier"), "keepawayball_carrying", '1 0 0', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierRed, _("Ball carrier"), "tka_taken_red", '0 1 1', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierBlue, _("Ball carrier"), "tka_taken_blue", '0 1 1', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierYellow, _("Ball carrier"), "tka_taken_yellow", '0 1 1', 1);
 +REGISTER_WAYPOINT(TkaBallCarrierPink, _("Ball carrier"), "tka_taken_pink", '0 1 1', 1);
  
+ REGISTER_WAYPOINT(LmsLeader, _("Leader"), "", '0 1 1', 1);
+ 
  REGISTER_WAYPOINT(NbBall, _("Ball"), "", '0.91 0.85 0.62', 1);
  REGISTER_WAYPOINT(NbGoal, _("Goal"), "", '1 0.5 0', 1);
  

diff --cc qcsrc/common/scores.qh
index f5889cfb305d3602572b2072ce358b6946541c7e,3449f2b53ee5b950b2d2916d8e593509decdece3..241d29bc3db5cf8d0ceaad41e1e973ca2901893b
--- 1/qcsrc/common/scores.qh
--- 2/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@@ -85,12 -57,31 +57,35 @@@ REGISTER_SP(LMS_LIVES)
  REGISTER_SP(NEXBALL_GOALS);
  REGISTER_SP(NEXBALL_FAULTS);
  
- REGISTER_SP(ONS_TAKES);
  REGISTER_SP(ONS_CAPS);
+ REGISTER_SP(ONS_TAKES);
  
 +REGISTER_SP(TKA_PICKUPS);
 +REGISTER_SP(TKA_BCTIME);
 +REGISTER_SP(TKA_CARRIERKILLS);
++
+ REGISTER_SP(SCORE);
+ REGISTER_SP(KILLS);
+ REGISTER_SP(DEATHS);
+ REGISTER_SP(TEAMKILLS);
+ REGISTER_SP(SUICIDES);
+ REGISTER_SP(DMG);
+ REGISTER_SP(DMGTAKEN);
+ 
+ REGISTER_SP(ELO); // not sortable
+ REGISTER_SP(FPS); // not sortable
+ 
+ // fields not networked via the score system
+ REGISTER_SP(END);
+ 
+ REGISTER_SP(PING);
+ REGISTER_SP(PL);
+ REGISTER_SP(NAME);
+ REGISTER_SP(SEPARATOR);
+ 
+ REGISTER_SP(KDRATIO); // kills / deaths
+ REGISTER_SP(SUM); // kills - deaths
+ REGISTER_SP(FRAGS); // kills - suicides
  #endif
  
  

diff --cc qcsrc/common/stats.qh
index 36678050166e41b100d47757237e0f5703171036,53f78cc5ad2d8b3b077441f9f0d8f5291c63a5e0..fa780ee801b7e2d7ed0eb1e652e3984137d92ff8
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -132,13 -130,8 +130,9 @@@ REGISTER_STAT(FROZEN, int
  REGISTER_STAT(REVIVE_PROGRESS, float)
  REGISTER_STAT(ROUNDLOST, int)
  REGISTER_STAT(CAPTURE_PROGRESS, float)
- REGISTER_STAT(ENTRAP_ORB, float)
- REGISTER_STAT(ENTRAP_ORB_ALPHA, float)
  REGISTER_STAT(ITEMSTIME, int, autocvar_sv_itemstime)
  REGISTER_STAT(KILL_TIME, float)
- REGISTER_STAT(VEIL_ORB, float)
- REGISTER_STAT(VEIL_ORB_ALPHA, float)
 +REGISTER_STAT(TKA_BALLSTATUS, int)
  
  #ifdef SVQC
  float autocvar_sv_showfps = 0;

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

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