Merge branch 'master' into terencehill/hud_updates 353/head
authorterencehill <piuntn@gmail.com>
Mon, 22 Aug 2016 13:10:10 +0000 (15:10 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 22 Aug 2016 13:10:10 +0000 (15:10 +0200)
commitc039d054a46888048d214000273ccfc63e4611b6
treede65ba0f5988f5dec6e07a05fa337c5190197a36
parenta3a484a54551f0208b6cf1e92bb7e5a3ee1a72f3
parentd6ebbe313a0198cd2c474bfe5bd79901113168f4
Merge branch 'master' into terencehill/hud_updates

Conflicts:
qcsrc/client/hud/hud.qc
17 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/powerups.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/mapvoting.qc
qcsrc/client/view.qc
qcsrc/common/minigames/minigame/bd.qc
qcsrc/common/minigames/minigame/c4.qc
qcsrc/common/minigames/minigame/nmm.qc
qcsrc/common/minigames/minigame/pong.qc
qcsrc/common/minigames/minigame/pp.qc
qcsrc/common/minigames/minigame/ps.qc
qcsrc/common/minigames/minigame/snake.qc
qcsrc/common/minigames/minigame/ttt.qc
qcsrc/common/mutators/mutator/itemstime/itemstime.qc