Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 16:46:53 +0000 (02:46 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 27 Jul 2015 16:46:53 +0000 (02:46 +1000)
commit153e558088db2813f7f7dd5367244b5470f4d425
tree36f60975db3cd677829121bdb1513899e87ebc9c
parentdb34cb152d5a7299366996a886f1f204ae1a28a3
parentfd8a3cfbe15df4e9854dbb288157fe863276a696
Merge branch 'master' into Mario/vehicles

# Conflicts:
# qcsrc/client/progs.src
# qcsrc/client/vehicles/all.qc
# qcsrc/client/vehicles/bumblebee.qc
# qcsrc/client/view.qc
# qcsrc/common/triggers/teleporters.qc
# qcsrc/server/t_halflife.qc
# qcsrc/server/vehicles/racer.qc
# qcsrc/server/vehicles/vehicle.qh
20 files changed:
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/triggers/teleporters.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/portals.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc