Merge branch 'master' into Mario/vehicles
authorMario <mario.mario@y7mail.com>
Mon, 18 Nov 2013 18:03:32 +0000 (05:03 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 18 Nov 2013 18:03:32 +0000 (05:03 +1100)
commit0a841c006af77049678686074323f976539069be
tree3083c752e6d295a4e74276d71ab478a7f69423c1
parentbf653d6c684616019d4edff5a5da9c5d95bd068d
parent3f195c9c45d7cbe2b7059e320f99493b433121f7
Merge branch 'master' into Mario/vehicles
12 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/tturrets.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/vehicles/unit/bumblebee.qc
qcsrc/common/vehicles/unit/spiderbot.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_assault.qc