Merge branch 'Mario/qcphysics' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 21 Jan 2020 20:09:47 +0000 (20:09 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 21 Jan 2020 20:09:47 +0000 (20:09 +0000)
Enable QC physics by default again, as the known issues with it have been resolved

See merge request xonotic/xonotic-data.pk3dir!696

.gitlab-ci.yml
qcsrc/server/client.qc

index 3e56730463f29ece0e3309e353fe0c851408e50e..15ea0ec5399f86916f9f8545ec80a42087866aea 100644 (file)
@@ -29,7 +29,7 @@ test_sv_game:
     - 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=d5bda479d65190330f6ee23c6f9aa5e7
+    - EXPECT=6535600492e1cb63af8e449570bffe4a
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'
index e0c13548cfa0d961496b801b4322acff44ffe142..887e00c5946263b8ddc511ec1a2ca1673cf9f733 100644 (file)
@@ -1069,7 +1069,7 @@ string getwelcomemessage(entity this)
        return s;
 }
 
-bool autocvar_sv_qcphysics = false; // TODO this is for testing - remove when qcphysics work
+bool autocvar_sv_qcphysics = true; // TODO this is for testing - remove when qcphysics work
 
 /**
 =============