Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Tue, 24 Feb 2015 05:00:12 +0000 (16:00 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 24 Feb 2015 05:00:12 +0000 (16:00 +1100)
commit37903827937b44f174275a75d2dab5301b8ab53e
treeaa2b781008099c1bb30f44d0b0f8e017cdd12e28
parent49aec17ab86b4b27fc372ed122aa3686219e8453
parentd54570b726a703243969825c816749ebdfe78d48
Merge branch 'master' into Mario/vehicles

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/client/vehicles/vehicles.qc
qcsrc/client/vehicles/vehicles.qh
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/common/vehicles/unit/bumblebee.qc
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/vehicles/vehicles.qh
qcsrc/server/weapons/weaponsystem.qh
36 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/damage.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/tturrets.qc
qcsrc/client/view.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications.qh
qcsrc/common/vehicles/cl_vehicles.qh
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/common/vehicles/unit/bumblebee.qc
qcsrc/common/vehicles/vehicles.qh
qcsrc/common/vehicles/vehicles_include.qh
qcsrc/server/antilag.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/portals.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_halflife.qc
qcsrc/server/t_teleporters.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/weapons/weaponsystem.qh