projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e744816
2e619b2
)
Merge branch 'Mario/fireball_merge' into 'master'
author
Mario <zacjardine@y7mail.com>
Tue, 28 Jun 2016 10:26:41 +0000
(10:26 +0000)
committer
Mario <zacjardine@y7mail.com>
Tue, 28 Jun 2016 10:26:41 +0000
(10:26 +0000)
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
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff