Merge branch 'master' into TimePath/notifications 292/head
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 10 Mar 2016 06:35:55 +0000 (17:35 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 10 Mar 2016 06:39:13 +0000 (17:39 +1100)
commit9f70bdba9a6fb2c06324be13504341da967f7028
treebef9296e1906d3b5f6ae22e4358b22daffc06832
parent6e7fae90a84673482a986aa83a6b618fb23c7eb5
parentf6aef4f937fde258e3cd8c7a05f7deb908a044c8
Merge branch 'master' into TimePath/notifications

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/hmg.qc
# qcsrc/common/mutators/mutator/overkill/rpc.qc
# qcsrc/common/weapons/weapon/arc.qc
# qcsrc/common/weapons/weapon/blaster.qc
# qcsrc/common/weapons/weapon/crylink.qc
# qcsrc/common/weapons/weapon/devastator.qc
# qcsrc/common/weapons/weapon/electro.qc
# qcsrc/common/weapons/weapon/fireball.qc
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/common/weapons/weapon/hlac.qc
# qcsrc/common/weapons/weapon/hook.qc
# qcsrc/common/weapons/weapon/machinegun.qc
# qcsrc/common/weapons/weapon/minelayer.qc
# qcsrc/common/weapons/weapon/mortar.qc
# qcsrc/common/weapons/weapon/rifle.qc
# qcsrc/common/weapons/weapon/seeker.qc
# qcsrc/common/weapons/weapon/shockwave.qc
# qcsrc/common/weapons/weapon/shotgun.qc
# qcsrc/common/weapons/weapon/vaporizer.qc
# qcsrc/common/weapons/weapon/vortex.qc
34 files changed:
qcsrc/common/constants.qh
qcsrc/common/mutators/mutator/campcheck/campcheck.qc
qcsrc/common/mutators/mutator/instagib/instagib.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/hmg.qc
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/t_items.qc
qcsrc/common/util.qh
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/tuba.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/weapons/weaponsystem.qc