Merge branch 'master' into Mario/vehicles
authorMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 02:13:40 +0000 (13:13 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 02:13:40 +0000 (13:13 +1100)
commit198765425d8c346faa41b601cba98247ca2ddac2
tree4400712eef4dd6ac57f3d71ae072d37e61335f5d
parent5e408ca67a92629baf75b880f2c3bbfe7373ca89
parentf65d6c4047bfc05f465e3cf2878de9f368b66bad
Merge branch 'master' into Mario/vehicles
32 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/client/tturrets.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/notifications.qh
qcsrc/common/vehicles/cl_vehicles.qc
qcsrc/common/vehicles/cl_vehicles.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/common/vehicles/vehicles.qc
qcsrc/common/vehicles/vehicles_include.qc
qcsrc/common/vehicles/vehicles_include.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.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
vehicle_racer.cfg
vehicles.cfg