From: Mario <zacjardine@y7mail.com>
Date: Tue, 3 Feb 2015 04:40:48 +0000 (+0000)
Subject: Merge branch 'terencehill/weapon_panel_fix' into 'master'
X-Git-Tag: xonotic-v0.8.1~129
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b4a0a5ea0f964c0a88877d1903580684ce73f307;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/weapon_panel_fix' into 'master'

Terencehill/weapon panel fix

Recent weapons panel changes weren't all good so I had to revert them: weapon icons currently are too wide when owning few weapons, onlyowned enabled and the panel shape is more squared.

Then I furtherly improved the previous code to achieve the same sev's goal, that is, more compact layout and better use of the available space.

See merge request !102
---

b4a0a5ea0f964c0a88877d1903580684ce73f307