Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sun, 20 Nov 2016 18:09:38 +0000 (04:09 +1000)
committerMario <mario@smbclan.net>
Sun, 20 Nov 2016 18:09:38 +0000 (04:09 +1000)
commitcbca1a79315fe08c4796273a490a4d12b7d3291d
treef09a665de90d54574bd3994f96e93ebac8b0f949
parent64f2b309aa5be8aafb9ad2137174bb6d99aeb876
parent6386150f532a0e6d86c074d81191465ee8586b00
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/client/view.qc
12 files changed:
qcsrc/client/hud/hud.qh
qcsrc/client/view.qc
qcsrc/common/_all.inc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/t_items.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/tuba.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/client.qc