Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Mon, 24 Oct 2016 17:47:15 +0000 (03:47 +1000)
committerMario <mario@smbclan.net>
Mon, 24 Oct 2016 17:47:15 +0000 (03:47 +1000)
commit646e82672a7a8b8db0be0caf5dbd062b0d04da96
tree7b6d08ae0b756a717668321e30f9f882e3123a4d
parentcc37ae9ec08cca9f8b17cdbf91e71380d0d6f700
parent9380d852b4541b6e3906313f34fc666997da6fa7
Merge branch 'master' into Mario/wepent_experimental
22 files changed:
mutators.cfg
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/stats.qh
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/events.qh
qcsrc/server/player.qc
qcsrc/server/sv_main.qc