Merge branch 'terencehill/weapon_panel_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 04:40:48 +0000 (04:40 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 04:40:48 +0000 (04:40 +0000)
commitb4a0a5ea0f964c0a88877d1903580684ce73f307
treef6cae6b839e4302c97cba93e83d9439b1ed4eb17
parent0ef08582f5a268b8168f6bf65843c5bc3d1395a0
parentbb80a6aba067167c6ef8d5f3465f03bd34142fa2
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