From: terencehill Date: Sun, 6 Mar 2022 01:09:13 +0000 (+0000) Subject: Merge branch 'z411/new_timer' into 'master' X-Git-Tag: xonotic-v0.8.5~177 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad73f4204b26b693746936874aa6966debd15534;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'z411/new_timer' into 'master' New timer with secondary round timer and sub text indicating game phase Closes #2636 See merge request xonotic/xonotic-data.pk3dir!978 --- ad73f4204b26b693746936874aa6966debd15534