From: Mario Date: Sun, 21 Jun 2020 18:49:41 +0000 (+0000) Subject: Merge branch 'bones_was_here/timeout_stuff' into 'master' X-Git-Tag: xonotic-v0.8.5~906 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=edc317efa7b44478e7bd5c2ba46eff432c603ea6;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'bones_was_here/timeout_stuff' into 'master' Allow vcall timein during a timeout, and reset slowmo if SVQC shuts down during a timeout See merge request xonotic/xonotic-data.pk3dir!830 --- edc317efa7b44478e7bd5c2ba46eff432c603ea6