From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 23 Mar 2016 20:30:57 +0000 (+0000)
Subject: Merge branch 'terencehill/warmup_limit' into 'master'
X-Git-Tag: xonotic-v0.8.2~1036
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cbdb7a96d12e868b8de189ac2a93172ec7a01acb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/warmup_limit' into 'master'

Warmup limit stat

Add a stat for warmup limit so the hud timer can show decreasing time and announcer can properly announce left minutes in warmup stage (it was improperly reading the server's cvar g_warmup_limit)

See merge request !295
---

cbdb7a96d12e868b8de189ac2a93172ec7a01acb