From: Mario <zacjardine@y7mail.com>
Date: Sun, 2 Aug 2015 02:38:11 +0000 (+0000)
Subject: Merge branch 'sev/hud_nades' into 'master'
X-Git-Tag: xonotic-v0.8.1~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09616f413d96c0436c5129cbcf78d95163fc1640;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/hud_nades' into 'master'

Nade HUD icons

Currently, the bonus nade is drawn in an unusual way in the ammo panel.
It is split up into different layers, with the top layer being multiplied the
color of the current nade type, which does not work well for Luma.
At the same time, there are separate nade icons for the notification panel.

**New solution**
Have one icon per nade type, use them for both panels.

See merge request !153
---

09616f413d96c0436c5129cbcf78d95163fc1640