Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 5 Mar 2013 10:51:36 +0000 (21:51 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 5 Mar 2013 10:51:36 +0000 (21:51 +1100)
commit967b6f037d11a823dad929627a9b20f779e130b2
tree75b1dc7c36633009551763d15a7f32b45fb55701
parentb080c1dada0e6e49639ee4d44c264365392c4c34
parent3b84c2fd559e06f8c0a259b28e4813df719758b7
Merge branch 'master' into mario/monsters
22 files changed:
commands.cfg
defaultXonotic.cfg
gamemodes.cfg
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_electro.qc