Merge branch 'master' into Juhu/scoreboard-strafe

diff --cc .gitlab-ci.yml
index 93ddc4381be060c149e1627f589c81e39cc38039,31378d8d25d85d6432a5b73209a2b11fc88127c1..f93f6e685427d22cd6d47c9952c576060c18f8de
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -50,12 -64,12 +64,12 @@@ test_sv_game
      - diff notifications.cfg data/data/notifications_dump.cfg ||\r
          { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
  \r
-     - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
-     - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
-     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
-     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
+     - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
+     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
+     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
+     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
  \r
-     - EXPECT=38f7947d353ec3645e90baefac3d180e\r
 -    - EXPECT=8fb740a3cb3754ca7b9295ddc5c911b5\r
++    - EXPECT=7c97367ef0e1f04b38350d9990d0de0e\r
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
Simple merge

diff --cc qcsrc/common/scores.qh
index 2ab83409334e78a47720110489bdbc572296f6b5,3449f2b53ee5b950b2d2916d8e593509decdece3..76566a50b4334bcc6d4091062f126738a833e37f
--- 1/qcsrc/common/scores.qh
--- 2/qcsrc/common/scores.qh
+++ b/qcsrc/common/scores.qh
@@@ -14,56 -15,25 +15,28 @@@ STATIC_INIT(Scores_renumber) { FOREACH(
  /*
   * Score indices
   */
- 
  #ifdef GAMEQC
- // 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
- 
  // networked fields
+ // NOTE: score registration order is used as player sort priority (after primary and secondary)
  
- REGISTER_SP(SCORE);
- 
- REGISTER_SP(DMG);
- REGISTER_SP(DMGTAKEN);
+ // TODO: move gamemode scores to gamemode files
+ // TODO: allow gamemodes to fully customize player sorting priority, even the common ones
  
- REGISTER_SP(KILLS);
- REGISTER_SP(DEATHS);
- REGISTER_SP(SUICIDES);
- REGISTER_SP(TEAMKILLS);
- 
- REGISTER_SP(ELO);
- 
- REGISTER_SP(FPS);
- 
- // TODO: move to common mutators
- 
- REGISTER_SP(RACE_TIME);
  REGISTER_SP(RACE_LAPS);
+ REGISTER_SP(RACE_TIME);
  REGISTER_SP(RACE_FASTEST);
  
- //REGISTER_SP(CTS_TIME);
- //REGISTER_SP(CTS_LAPS);
- //REGISTER_SP(CTS_FASTEST);
 +REGISTER_SP(CTS_STRAFE);
 +REGISTER_SP(CTS_STARTSPEED);
 +
  REGISTER_SP(ASSAULT_OBJECTIVES);
  
- REGISTER_SP(CTF_PICKUPS);
+ REGISTER_SP(CTF_CAPS);
  REGISTER_SP(CTF_FCKILLS);
  REGISTER_SP(CTF_RETURNS);
- REGISTER_SP(CTF_CAPS);
- REGISTER_SP(CTF_CAPTIME);
  REGISTER_SP(CTF_DROPS);
+ REGISTER_SP(CTF_PICKUPS);
+ REGISTER_SP(CTF_CAPTIME);
  
  REGISTER_SP(DOM_TAKES);
  REGISTER_SP(DOM_TICKS);