Merge branch 'master' into Mario/csqc_muzzleflash
authorMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:13:57 +0000 (21:13 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:13:57 +0000 (21:13 +1000)
commit90d9f7c775306324957323d53d5a4ad995d999e3
tree9f7dcbd1205f75f49866064edc95ad1822e44b91
parent2ccfbaf3d871db94af3195383a57ff738abaa07a
parent09af183261cd902191150d197c3411292b45ab77
Merge branch 'master' into Mario/csqc_muzzleflash
qcsrc/common/effects/all.qc
qcsrc/common/effects/all.qh
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/vaporizer.qc