From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Tue, 17 Jan 2023 21:07:06 +0000 (+0100)
Subject: Merge branch 'master' into Juhu/scoreboard-strafe
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a57b11c30c83e2adfcf6df74b3dd6a2ca632d93;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Juhu/scoreboard-strafe
---

3a57b11c30c83e2adfcf6df74b3dd6a2ca632d93
diff --cc .gitlab-ci.yml
index 93ddc4381,31378d8d2..f93f6e685
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -50,12 -64,12 +64,12 @@@ test_sv_game
      - diff notifications.cfg data/data/notifications_dump.cfg ||
          { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }
  
-     - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
-     - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
-     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
-     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
+     - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
+     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
+     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
+     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
  
-     - EXPECT=38f7947d353ec3645e90baefac3d180e
 -    - EXPECT=8fb740a3cb3754ca7b9295ddc5c911b5
++    - EXPECT=7c97367ef0e1f04b38350d9990d0de0e
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'
diff --cc qcsrc/common/scores.qh
index 2ab834093,3449f2b53..76566a50b
--- a/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);