Merge branch 'master' into TimePath/debug_draw 248/head
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 4 Nov 2015 01:36:48 +0000 (12:36 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 4 Nov 2015 01:36:48 +0000 (12:36 +1100)
commit2b728b9c59ef61318b7ca5a261cb7fa45d2143aa
treed5a594bb310effb68f971e558bb384ab4433c50f
parentb683bf23a495d3b1b3f6df3bda75bfe0f069ab05
parent070e6634331ba27017b1a2d36e9b910ad02fb861
Merge branch 'master' into TimePath/debug_draw

# Conflicts:
# qcsrc/server/weapons/weaponsystem.qc
30 files changed:
qcsrc/client/tuba.qc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/vehicles/vehicle/raptor.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/server/bot/scripting.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/mutator_nades.qc
qcsrc/server/mutators/mutator/mutator_overkill.qc
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/weaponsystem.qc