From: Mario Date: Wed, 12 Aug 2015 10:09:52 +0000 (+0000) Subject: Merge branch 'sev/luma_itemstime' into 'master' X-Git-Tag: xonotic-v0.8.1~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d78c1f16b437679d92a3b680525cb41db1b0a46e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'sev/luma_itemstime' into 'master' Small icon updates for itemstime panel I made a few revisions after the merge of the itemstime panel: - Because HUD icons are inherited from the default theme, it is unnecessary to add identical icons to the luminos theme. So I removed them to save some space. - There already are icons for the strength and shield powerups, it is redundant to add second versions. However, the quality of the new icons is a lot better than the old ones, so I moved `default/item_shield` and `default/item_strength` to `default/shield` and `default/strength`. - To match these new powerup icons, I updated the buff and superweapons icons. - I added new icons to the Luma theme. See merge request !169 --- d78c1f16b437679d92a3b680525cb41db1b0a46e