From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Aug 2015 05:53:33 +0000 (+0000)
Subject: Merge branch 'Mario/send_effects' into 'master'
X-Git-Tag: xonotic-v0.8.2~2065
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=e500c4c3ae16913240d1bd0509e68510195f2872;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/send_effects' into 'master'

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

e500c4c3ae16913240d1bd0509e68510195f2872