]> 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: a11e9f5 b9ed1a3)
Merge branch 'martin-t/bullet-trails' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 14:36:44 +0000 (14:36 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 14:36:44 +0000 (14:36 +0000)
Pass effect entity to fireBullet(), give weak trail to hitscan weaps

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


Trivial merge