Merge branch 'master' into Juhu/scoreboard-strafe

diff --cc .gitlab-ci.yml
index b9227229272c7ba0265473bc2cf20237a4b0ef7b,8b56b81ff39f4e9dda7e29a01cca19b8d679fd06..93ddc4381be060c149e1627f589c81e39cc38039
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -31,9 -54,9 +54,9 @@@ test_sv_game
      - 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
-     - make\r
-     - EXPECT=028dcf7335482c5bf83e4a8835f2d66b\r
-     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
+ \r
 -    - EXPECT=8e36763a3b4590356bcc449b2452d0ea\r
++    - EXPECT=38f7947d353ec3645e90baefac3d180e\r
+     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | sed -e 's,^\[[^]]*\] ,,'\r
        | grep '^:'\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
Simple merge

diff --cc qcsrc/server/_mod.inc
Simple merge

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