Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Mon, 13 Jul 2015 02:34:08 +0000 (12:34 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 13 Jul 2015 02:34:08 +0000 (12:34 +1000)
commit1bc3ab0285f65c7ed0c75cbba00da2460921c973
tree8bb11e22cbb53501dfbe416d8a6cc674f4c0c4c3
parentacb86c9c65c60005e539c16cd544d00a94264b66
parent1471179ee293a17194be4e25c1e387bd451370a6
Merge branch 'master' into Mario/vehicles

Conflicts:
qcsrc/client/damage.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/vehicles/all.qc
qcsrc/client/vehicles/all.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/server/antilag.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/mutators_include.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_halflife.qc
qcsrc/server/t_teleporters.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/bumblebee.qh
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicle.qc
31 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/monsters/sv_monsters.qc
qcsrc/common/notifications.qh
qcsrc/common/vehicles/sv_vehicles.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/gamemode_ctf.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