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

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

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

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

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

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

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

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

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

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

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

diff --cc qcsrc/server/race.qc
index b3d087f165f214676fa39bb765fdc843b36c41f1,078f9e1923a7bf300adb9ec879d790e59567693d..e882c9677ab8bafd8d3a1d01132684370b6d3faf
--- 1/qcsrc/server/race.qc
--- 2/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@@ -64,23 -54,13 +64,19 @@@ 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)));
 -      // also write a marker into demo files for demotc-race-record-extractor to find
 -      stuffcmd(pl,
 -              sprintf("//%s RECORD SET %s %f %f\n", strconv(2, 0, 0, GetGametype()),
 -                      TIME_ENCODED_TOSTRING(TIME_ENCODE(dt), false), tstart, 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
 +    if (pl.crypto_idfp != "") {
-       stuffcmd(pl,
-                strcat(
-                    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), false)),
-                    strcat(" ", ftos(tstart), " ", ftos(dt), " ", ftos(newpos), " ANONYMOUS\n")));
-     }
++              stuffcmd(pl,
++                      sprintf("//%s RECORD SET %s %f %f %f %s\n", strconv(2, 0, 0, GetGametype()),
++                              TIME_ENCODED_TOSTRING(TIME_ENCODE(dt), false), tstart, dt, newpos, pl.crypto_idfp));
++      } else {
++              stuffcmd(pl,
++                      sprintf("//%s RECORD SET %s %f %f %f ANONYMOUS\n", strconv(2, 0, 0, GetGametype()),
++                              TIME_ENCODED_TOSTRING(TIME_ENCODE(dt), false), tstart, dt, newpos));
++      }
  }
  
  IntrusiveList g_race_targets;

diff --cc qcsrc/server/race.qh
Simple merge

diff --cc xonotic-server.cfg
Simple merge