Merge branch 'master' into Mario/arc_bolt_bounce
authorMario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 05:55:56 +0000 (15:55 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 05:55:56 +0000 (15:55 +1000)
commitad464bb5417768682f9989dd025871d14a438e68
treed2234b857e7c4f033f1572db67afd1c97d4a5784
parent8195ee434711bac7c4c450c6bbe5f12487241336
parent774440a5f1736de1fa72499ff7358d123b8f99fb
Merge branch 'master' into Mario/arc_bolt_bounce
qcsrc/client/weapons/projectile.qc
qcsrc/common/weapons/weapon/arc.qc