Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 19:22:25 +0000 (06:22 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 19:22:25 +0000 (06:22 +1100)
commit0f444e0d57db660b27b5a54a263a61bc5da41004
tree40e3c24e1c2701d9145814340a4ca54aa905a81f
parent198765425d8c346faa41b601cba98247ca2ddac2
parent26f74fde4b86df999a01be07a6b78adf8e00a88c
Merge branch 'master' into Mario/vehicles

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/progs.src
24 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/notifications.qh
qcsrc/common/vehicles/cl_vehicles.qc
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/common/vehicles/vehicles.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.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/gamemode_ctf.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src