]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 277b777 c8c4875)
Merge remote-tracking branch 'origin/master' into pending-release
authorbones_was_here <bones_was_here@xonotic.au>
Sun, 28 May 2023 04:38:13 +0000 (14:38 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Sun, 28 May 2023 04:38:13 +0000 (14:38 +1000)
1  2 
.gitlab-ci.yml patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

diff --cc .gitlab-ci.yml
index 61a2cfef5385d969147165cbabd609e8988ebdf5,1feae253cbcd4231b69ae551e0466917e3ee043e..58d1e45823ba3579e85304b567163ae4a00c6a47
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,7 -75,7 +75,7 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
  \r
-     - EXPECT=e7c012825007ed251efa4e52dfbb592e\r
 -    - EXPECT=20c9c4ea0364fbb611656cc0b876e02b\r
++    - EXPECT=b4bfc34b5a52ba950de9814c2c52c1c3\r
      - HASH=$(${ENGINE} +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | grep '^:'\r
diff --cc qcsrc/server/world.qc
Simple merge