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

diff --cc _hud_common.cfg
Simple merge

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/server/race.qc
index d7c40e5398f3fb223c6aa0b117c9ac48f03bd2f2,63e6efa8c6f31197bf0a58c23f2c1b243ea2dae1..94b3c79b44f209a4e660fa929f92ee2d9357c43a
--- 1/qcsrc/server/race.qc
--- 2/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@@ -54,23 -54,15 +54,23 @@@ string uid2name(string myuid
        return s;
  }
  
 -void write_recordmarker(entity pl, float tstart, float dt)
 +void write_recordmarker(entity pl, float newpos, float tstart, float dt)
  {
 -    GameLogEcho(strcat(":recordset:", ftos(pl.playerid), ":", ftos(dt)));
 +    GameLogEcho(strcat(":recordset:", ftos(newpos), ":", ftos(pl.playerid), ":", ftos(etof(pl)), ":", ftos(dt)));
  
      // also write a marker into demo files for demotc-race-record-extractor to find
 -    stuffcmd(pl,
 -             strcat(
 -                 strcat("//", strconv(2, 0, 0, GetGametype()), " RECORD SET ", TIME_ENCODED_TOSTRING(TIME_ENCODE(dt), false)),
 -                 " ", ftos(tstart), " ", ftos(dt), "\n"));
 +    if (pl.crypto_idfp != "") {
 +      stuffcmd(pl,
 +               strcat(
-                    strcat("//", strconv(2, 0, 0, GetGametype()), " RECORD SET ", TIME_ENCODED_TOSTRING(TIME_ENCODE(dt))),
++                   strcat("//", strconv(2, 0, 0, GetGametype()), " RECORD SET ", TIME_ENCODED_TOSTRING(TIME_ENCODE(dt), false)),
 +                   strcat(" ", ftos(tstart), " ", ftos(dt), " ", ftos(newpos), " "),
 +                   strcat(pl.crypto_idfp, "\n")));
 +    } else {
 +      stuffcmd(pl,
 +               strcat(
-                    strcat("//", strconv(2, 0, 0, GetGametype()), " RECORD SET ", TIME_ENCODED_TOSTRING(TIME_ENCODE(dt))),
-                    strcat(" ", ftos(tstart), " ", ftos(dt), " ", ftos(newpos), " ANONYMOUS")));
++                   strcat("//", strconv(2, 0, 0, GetGametype()), " RECORD SET ", TIME_ENCODED_TOSTRING(TIME_ENCODE(dt), false)),
++                   strcat(" ", ftos(tstart), " ", ftos(dt), " ", ftos(newpos), " ANONYMOUS\n")));
 +    }
  }
  
  IntrusiveList g_race_targets;

diff --cc qcsrc/server/race.qh
index 537082da7b283ae61ecfff8011864f18fbaba858,1e851ee3041e7fd671397c917571292b5a5ef863..6cb7c6ad1f22c9977fd15ee13824c0b7bafd7b08
--- 1/qcsrc/server/race.qh
--- 2/qcsrc/server/race.qh
+++ b/qcsrc/server/race.qh
@@@ -8,9 -8,8 +8,9 @@@ float race_teams
  const float ST_RACE_LAPS = 1;
  
  int autocvar_g_cts_send_rankings_cnt = 15;
 +bool autocvar_g_cts_cptimes_onlyself = false;
  
- bool g_race_qualifying;
+ int g_race_qualifying;
  
  float speedaward_lastsent;
  float speedaward_lastupdate;