From: Mario <zacjardine@y7mail.com>
Date: Tue, 28 Jun 2016 10:26:41 +0000 (+0000)
Subject: Merge branch 'Mario/fireball_merge' into 'master'
X-Git-Tag: xonotic-v0.8.2~700^2~118
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=5972fcfdf1ffe5bef1df9edc2de2944abbeba280;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/fireball_merge' into 'master'

Merge branch Mario/fireball_merge (S merge request)

Resurrecting diabolik's old fireball model (probably abandoned due to an issue with nonsolid weapon model, which I have fixed here).

See merge request !328
---

5972fcfdf1ffe5bef1df9edc2de2944abbeba280