]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b042359 3cfb647)
Merge branch 'Mario/hagar_notfixed' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 7 Apr 2016 19:04:42 +0000 (19:04 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 7 Apr 2016 19:04:42 +0000 (19:04 +0000)
Merge branch Mario/hagar_notfixed (M merge request)

Uses manual handling of the hagar's attack refires, fixes looping of the hagar attack animation.

See merge request !297


Trivial merge