From: Mario <zacjardine@y7mail.com>
Date: Thu, 7 Apr 2016 19:04:42 +0000 (+0000)
Subject: Merge branch 'Mario/hagar_notfixed' into 'master'
X-Git-Tag: xonotic-v0.8.2~968
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=78f89dad80d777dfa60a74b92851e6f7628abe00;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/hagar_notfixed' into 'master'

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
---

78f89dad80d777dfa60a74b92851e6f7628abe00