Merge branch 'master' into TimePath/items
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Oct 2015 00:15:17 +0000 (11:15 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Oct 2015 00:15:17 +0000 (11:15 +1100)
commit948c08402a7b9b7af36059104937650e343ecefe
treeccd3fe32f4da0d22f9205f0bae9300635736fffc
parent787cb6767545b9ceef2dfb368cb8d6c587fbe0cc
parent7fdbf7937f5130e5cd6a3431a57aceed909e2a66
Merge branch 'master' into TimePath/items

# Conflicts:
# qcsrc/server/mutators/gamemode_ctf.qh
# qcsrc/server/t_items.qc
32 files changed:
qcsrc/client/hud.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/mutators/mutator/instagib/instagib.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/turrets/turret/ewheel_weapon.qc
qcsrc/common/turrets/turret/flac_weapon.qc
qcsrc/common/turrets/turret/hellion_weapon.qc
qcsrc/common/turrets/turret/hk_weapon.qc
qcsrc/common/turrets/turret/machinegun_weapon.qc
qcsrc/common/turrets/turret/mlrs_weapon.qc
qcsrc/common/turrets/turret/phaser_weapon.qc
qcsrc/common/turrets/turret/plasma_dual.qc
qcsrc/common/turrets/turret/plasma_weapon.qc
qcsrc/common/turrets/turret/tesla_weapon.qc
qcsrc/common/turrets/turret/walker_weapon.qc
qcsrc/common/vehicles/vehicle/racer_weapon.qc
qcsrc/common/vehicles/vehicle/raptor_weapons.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/throwing.qc