]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Juhu/scoreboard-strafe
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sat, 20 Mar 2021 15:05:30 +0000 (16:05 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sat, 20 Mar 2021 15:15:32 +0000 (16:15 +0100)
1  2 
.gitlab-ci.yml
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc

diff --cc .gitlab-ci.yml
index ef8d0847b0865cd4daf4de75d261d24e71bfd488,1fc76cf43efe20f2fc2429744e4efa8a3601060d..3010a5deb77a54fe5cd0600d6176ed827490842a
@@@ -1,81 -1,90 +1,90 @@@
- before_script:
-   - ln -s $PWD data/xonotic-data.pk3dir
-   - git clone --depth=1 --branch=master https://gitlab.com/xonotic/gmqcc.git gmqcc
-   - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"
-   - cd ..
- report_cloc:
-   stage: test
-   script:
-     - cloc --force-lang-def=qcsrc/tools/cloc.txt --sql 1 --sql-project xonotic qcsrc | sqlite3 code.db
-     - sqlite3 code.db 'select file,nCode from t where nCode > 1000 order by nBlank+nComment+nCode desc'
- test_compilation_units:
-   stage: test
-   script:
-     - ./qcsrc/tools/compilationunits.sh
- test_sv_game:
-   stage: test
-   script:
-     - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-     - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
-     - cd ..
-     - mkdir -p data/maps
-     - 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
-     - make
-     - EXPECT=d357b667dc459574d1b4ae1a195d3d1f
-     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
-       | tee /dev/stderr
-       | grep '^:'
-       | grep -v '^:gamestart:'
-       | grep -v '^:anticheat:'
-       | md5sum | awk '{ print $1 }')
-     - echo 'expected:' $EXPECT
-     - echo '  actual:' $HASH
-     - test "$HASH" == "$EXPECT"
-     - exit $?
- test_sv_unit:
-   stage: test
-   script:
-     - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-     - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
-     - cd ..
-     - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
-     - make
-     - while read line; do
-         echo $line;
-         if [[ $line == "All tests OK" ]]; then exit 0; fi;
-       done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)
-     - exit 1
- # NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.
- # With them added to PREDEFINED, it would take over half an hour to generate the docs and even then
- # they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.
- doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
-   stage: deploy
-   script:
-     - cd qcsrc && doxygen
-     - mv html ../public
-     - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done
-     - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
-     - chmod 600 ~/.ssh/id_rsa
-     - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config
-     - git config --global user.name "Gitlab CI"
-     - git config --global user.email "<>"
-     - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_
-     - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_
-     - cp -r ../public/* ~/deploy
-     - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages
-   artifacts:
-     paths:
-       - public
-   only:
-     - master
+ workflow:\r
+   rules:\r
+     - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/\r
+       when: never\r
+     - when: always\r
\r
+ before_script:\r
+   - ln -s $PWD data/xonotic-data.pk3dir\r
\r
+   - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc\r
+   - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"\r
+   - cd ..\r
\r
+ test_compilation_units:\r
+   rules:\r
+     - changes:\r
+       - qcsrc/**/*\r
+   stage: test\r
+   script:\r
+     - ./qcsrc/tools/compilationunits.sh\r
\r
+ test_sv_game:\r
+   stage: test\r
+   script:\r
+     - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
+     - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"\r
+     - cd ..\r
\r
+     - mkdir -p data/maps\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
+     - make\r
 -    - EXPECT=570561a503853d1224450fbdfb8b3315\r
++    - EXPECT=ae4d27dd465e976cd5afa35365eea0d7\r
+     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
+       | tee /dev/stderr\r
+       | sed -e 's,^\[[^]]*\] ,,'\r
+       | grep '^:'\r
+       | grep -v '^:gamestart:'\r
+       | grep -v '^:anticheat:'\r
+       | md5sum | awk '{ print $1 }')\r
+     - echo 'expected:' $EXPECT\r
+     - echo '  actual:' $HASH\r
+     - test "$HASH" == "$EXPECT"\r
+     - exit $?\r
\r
+ test_sv_unit:\r
+   stage: test\r
+   script:\r
+     - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
+     - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"\r
+     - cd ..\r
\r
+     - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
+     - make\r
+     - while read line; do\r
+         echo $line;\r
+         if [[ $line == "All tests OK" ]]; then exit 0; fi;\r
+       done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)\r
+     - exit 1\r
\r
+ # NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.\r
+ # With them added to PREDEFINED, it would take over half an hour to generate the docs and even then\r
+ # they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.\r
+ doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB\r
+   before_script:\r
+     - ln -s $PWD data/xonotic-data.pk3dir # is this needed?\r
+     - apt-get update\r
+     - apt-get -y install doxygen graphviz\r
+   stage: deploy\r
+   script:\r
+     - cd qcsrc && doxygen\r
+     - mv html ../public\r
+     - mkdir -p ~/.ssh\r
+     - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done\r
+     - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa\r
+     - chmod 600 ~/.ssh/id_rsa\r
+     - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config\r
+     - git config --global user.name "Gitlab CI"\r
+     - git config --global user.email "<>"\r
+     - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_\r
+     - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_\r
+     - cp -r ../public/* ~/deploy\r
+     - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages\r
+   artifacts:\r
+     paths:\r
+       - public\r
+   only:\r
+     - master\r
Simple merge
index f28c5613e6e68b646d7defdf57c7938c3b257ad5,458465faaa260587a60563407fa72630d228c21e..31988cb1086bf3bcdb85943ddaa5d4d1835d1d36
@@@ -151,12 -149,9 +151,12 @@@ MUTATOR_HOOKFUNCTION(cts, reset_map_glo
        Score_NicePrint(NULL);
  
        race_ClearRecords();
-       PlayerScore_Sort(race_place, 0, 1, 0);
+       PlayerScore_Sort(race_place, 0, true, false);
  
        FOREACH_CLIENT(true, {
 +              it.strafe_efficiency_best = -2;
 +              PlayerScore_Set(it, SP_CTS_STRAFE, -20000);
 +
                if(it.race_place)
                {
                        s = GameRules_scoring_add(it, RACE_FASTEST, 0);
@@@ -183,31 -178,8 +183,11 @@@ MUTATOR_HOOKFUNCTION(cts, ClientConnect
  
        race_PreparePlayer(player);
        player.race_checkpoint = -1;
++      player.strafe_efficiency_sum = player.strafe_efficiency_tics = 0;
++      player.strafe_efficiency_best = -2;
++      PlayerScore_Set(player, SP_CTS_STRAFE, -20000);
  
-       if(IS_REAL_CLIENT(player))
-       {
-               string rr = CTS_RECORD;
-               msg_entity = player;
-               race_send_recordtime(MSG_ONE);
-               race_send_speedaward(MSG_ONE);
-               speedaward_alltimebest = stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed")));
-               speedaward_alltimebest_holder = uid2name(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp")));
-               race_send_speedaward_alltimebest(MSG_ONE);
-               float i;
-               int m = min(RANKINGS_CNT, autocvar_g_cts_send_rankings_cnt);
-               race_send_rankings_cnt(MSG_ONE);
-               for (i = 1; i <= m; ++i)
-               {
-                       race_SendRankings(i, 0, 0, MSG_ONE);
-               }
-               player.strafe_efficiency_sum = player.strafe_efficiency_tics = 0;
-               player.strafe_efficiency_best = -2;
-               PlayerScore_Set(player, SP_CTS_STRAFE, -20000);
-       }
+       race_SendAll(player, false);
  }
  
  MUTATOR_HOOKFUNCTION(cts, AbortSpeedrun)