From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Sep 2018 14:36:44 +0000 (+0000)
Subject: Merge branch 'martin-t/bullet-trails' into 'master'
X-Git-Tag: xonotic-v0.8.5~1797^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34f3c1d754abe766f800408a3e7bb0172ddda21f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/bullet-trails' into 'master'

Pass effect entity to fireBullet(), give weak trail to hitscan weaps

See merge request xonotic/xonotic-data.pk3dir!521
---

34f3c1d754abe766f800408a3e7bb0172ddda21f