Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Wed, 7 Jan 2015 01:47:16 +0000 (12:47 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 7 Jan 2015 01:47:16 +0000 (12:47 +1100)
commit591137cbf2cbf263945e89a1421887b0a3d82a3a
tree588de66ef137202f6d48bec0c2925ef2e09cd0ac
parentf80494c16cf9d95def0142b6c5d7146baa1ea9e2
parentb12cf542eb537763175e397e95a8173cd3f5467d
Merge branch 'master' into Mario/vehicles

Conflicts:
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/notifications.qh
qcsrc/common/vehicles/unit/bumblebee.qc
qcsrc/server/cl_weapons.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
28 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/notifications.qh
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/common/vehicles/unit/bumblebee.qc
qcsrc/common/vehicles/unit/racer.qc
qcsrc/common/vehicles/unit/raptor.qc
qcsrc/common/vehicles/unit/spiderbot.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/g_damage.qc
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/portals.qc
qcsrc/server/progs.src
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/weapons/weaponsystem.qh
vehicles.cfg