]> 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: f40126e 9315733)
Merge branch 'bones_was_here/timeout_stuff' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 21 Jun 2020 18:49:41 +0000 (18:49 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 21 Jun 2020 18:49:41 +0000 (18:49 +0000)
Allow vcall timein during a timeout, and reset slowmo if SVQC shuts down during a timeout

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


Trivial merge