From: Mario <zacjardine@y7mail.com>
Date: Wed, 8 Jun 2016 08:38:41 +0000 (+0000)
Subject: Merge branch 'terencehill/respawn_timer_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~886
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=490a31934aa67cc7de5299a4d3f625d5271f8583;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/respawn_timer_fix' into 'master'

Respawn timer fix

Improve respawn timer when max respawn delay is higher than respawn delay

Example:
g_forced_respawn 1
g_respawn_delay_max 10
g_respawn_delay_small 7

* Current timer behaviour:

"You are dead, wait 10 seconds before respawning" (and counting down)
if you press the jump key after 4 seconds it changes to:
"Respawning in 6 seconds..."  (and counting down)
but you respawn when it shows:
"Respawning in 3 seconds..."

* New behaviour (fixed):

"You are dead, wait 7 seconds before respawning" (and counting down)
if you press the jump key after 4 seconds it changes to:
"Respawning in 3 seconds..."  (and counting down)
and you respawn when the countdown ends, as expected
if you let pass 7 seconds without pressing the jump key, it shows:
"Respawning in 3 seconds..." (and counting down)
and you respawn when the countdown ends, as expected

See merge request !319
---

490a31934aa67cc7de5299a4d3f625d5271f8583