From: Mario <zacjardine@y7mail.com>
Date: Wed, 24 Aug 2016 04:21:56 +0000 (+0000)
Subject: Merge branch 'terencehill/hud_updates' into 'master'
X-Git-Tag: xonotic-v0.8.2~674
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7785114f6fb42a3a52c39413bf6e725607d338b2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/hud_updates' into 'master'

HUD updates

* Display more panels (engineinfo, modicons and timer) while showing the scoreboard (changes implementation of how panels fades when showing the scoreboard)
* Vote panel: display the bg too while the menu is shown
* When the game ends timer shows elapsed time
* Apply global hud alpha to the map vote panel, fixing fading when showing the scoreboard
* Mark panels that can't be disabled manually (main panel cvar doesn't exist) so hud editor considers them enabled

See merge request !353
---

7785114f6fb42a3a52c39413bf6e725607d338b2