From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 13:26:18 +0000 (+0000)
Subject: Merge branch 'Mario/item_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.2~1947
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cea275266508b193506a04cffe1a695c55831348;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/item_fixes' into 'master'

Merge branch Mario/item_fixes (M merge request)

Fixes some issues with items, and adds the infamous item fading hack (disabled by default)

See merge request !212
---

cea275266508b193506a04cffe1a695c55831348