]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/fireball_merge' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 28 Jun 2016 10:26:41 +0000 (10:26 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 28 Jun 2016 10:26:41 +0000 (10:26 +0000)
commit5972fcfdf1ffe5bef1df9edc2de2944abbeba280
tree439b89340105c51ea38927249d17fd2b12677c0f
parente744816972e1098b2e42ddab916988bbc34c676d
parent2e619b265112fc451a0eb735ccac794776f4ad15
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