Merge branch 'master' into Mario/intrusive_2
authorMario <mario@smbclan.net>
Sat, 27 Aug 2016 05:50:24 +0000 (15:50 +1000)
committerMario <mario@smbclan.net>
Sat, 27 Aug 2016 05:50:24 +0000 (15:50 +1000)
commit393022c0e9b00481e68d1db786e96e4ffb7f37e0
treea7fd5c65456bd0d9f9da5d0479c8a6261656e186
parent21fdd7bdfc222142ffd047a200cb2bd214c5d511
parentc670ebcbf07409b87a5b169be1ed27d05aab2774
Merge branch 'master' into Mario/intrusive_2
21 files changed:
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/turrets/turret/walker.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_hook.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/player.qc
qcsrc/server/sv_main.qc