]> 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: 17f8cde 09cab06)
Merge branch 'Mario/send_effects' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 05:53:33 +0000 (05:53 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 05:53:33 +0000 (05:53 +0000)
Merge branch Mario/send_effects (M merge request)

Networks particle effects with CSQC, to allow mismatching effectinfo.txt (potentially fixes issues with changing effects around during testing on a server).

See merge request !187


Trivial merge