From: Juhu <5894800-Juhu_@users.noreply.gitlab.com> Date: Sat, 20 Mar 2021 15:05:30 +0000 (+0100) Subject: Merge branch 'master' into Juhu/scoreboard-strafe X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93e4c6c6ac9978ac15c004ed5be06fe0a009f10d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Juhu/scoreboard-strafe --- 93e4c6c6ac9978ac15c004ed5be06fe0a009f10d diff --cc .gitlab-ci.yml index ef8d0847b,1fc76cf43..3010a5deb --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@@ -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: + rules: + - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/ + when: never + - when: always + + before_script: + - ln -s $PWD data/xonotic-data.pk3dir + + - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc + - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc" + - cd .. + + test_compilation_units: + rules: + - changes: + - qcsrc/**/* + 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=570561a503853d1224450fbdfb8b3315 ++ - EXPECT=ae4d27dd465e976cd5afa35365eea0d7 + - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg + | tee /dev/stderr + | sed -e 's,^\[[^]]*\] ,,' + | 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 + before_script: + - ln -s $PWD data/xonotic-data.pk3dir # is this needed? + - apt-get update + - apt-get -y install doxygen graphviz + stage: deploy + script: + - cd qcsrc && doxygen + - mv html ../public + - mkdir -p ~/.ssh + - 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 diff --cc qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc index f28c5613e,458465faa..31988cb10 --- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc +++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc @@@ -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)