]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/bullet-trails
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 2 Jul 2018 06:41:18 +0000 (08:41 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 2 Jul 2018 06:41:18 +0000 (08:41 +0200)
commitbc3f297ed082b23fb33dd0d8f5dcd33bb0198507
tree42a761d5e870d993688ad008752fb59742dbb97f
parent1ac2bd6741a9e43e8c05c1a5989a50773e9b04c2
parentcb56f52defa1b0503dc6db27b6bce4ef878be13a
Merge branch 'master' into martin-t/bullet-trails
qcsrc/common/effects/effectinfo.inc
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/turrets/turret/machinegun_weapon.qc
qcsrc/common/turrets/turret/walker_weapon.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/tracing.qh