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)
commitedc317efa7b44478e7bd5c2ba46eff432c603ea6
tree337c2014124240b2eb74cc46771b1f3b4e9ff093
parentf40126e8e3bbaf7fe10dc7644674406225df3766
parent9315733d04c3fab6b6ad1e3f6d8c4627ffb860b6
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