]> 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: e5572a4 f767f4d)
Merge branch 'Mario/buff_updates' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 10 Aug 2015 17:58:19 +0000 (17:58 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 10 Aug 2015 17:58:19 +0000 (17:58 +0000)
Merge branch Mario/buff_updates (XL merge request)

Includes many changes & fixes to the buffs mutator, along with sev's work on their graphical side (HUD & model icons).

See merge request !162

1  2 
qcsrc/common/stats.qh patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge