Merge branch 'master' into Mario/monsters
authorMario <zacjardine@y7mail.com>
Thu, 6 Sep 2018 11:25:45 +0000 (21:25 +1000)
committerMario <zacjardine@y7mail.com>
Thu, 6 Sep 2018 11:25:45 +0000 (21:25 +1000)
commit74cbc0f6613383108745f231c78a340d747fc094
treece05f9d2f79023d222ff825c5c79a1e35bcc1f51
parent47cabd5fc5c6b825b7b9d0a11fb7e76b3d4c3d35
parent22d62089c5c83e3cd91b9499b4020ba711def95c
Merge branch 'master' into Mario/monsters
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc