Merge branch 'master' into Mario/headshots 839/head
authorMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 17:15:15 +0000 (03:15 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 17:15:15 +0000 (03:15 +1000)
commit1ce1c9c94867fb8ac44ab09c93eb092341dd6d9a
treeb0fe816d175f68ee6fd71a6c49da65e92bd5ed8e
parent42a881cbe552bb6ce4a13106cafc9d2f1a8152de
parent428da72281f326b423fbd2649f138bb24ca8fa0b
Merge branch 'master' into Mario/headshots
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/turrets/turret/machinegun_weapon.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/rifle.qh
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc