Merge branch 'master' into TimePath/debug_draw
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:36:00 +0000 (19:36 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:36:00 +0000 (19:36 +1100)
commitcd141fba8a7c59fef4b0e98eee651943b18cd99d
treefe1fdb284297c9376d3d92bd632a32f66e76ea78
parente9e91f9bc18dd5002e60c595c83cb8f45068a14b
parent05ac51f9cc85dead7e1ba6e5cb5b1754b20d3802
Merge branch 'master' into TimePath/debug_draw

# Conflicts:
# qcsrc/common/items/inventory.qh
23 files changed:
qcsrc/client/announcer.qc
qcsrc/common/effects/all.qh
qcsrc/common/items/inventory.qh
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.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/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/porto.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/lib/oo.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/weapons/throwing.qc