Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 7 May 2013 08:44:25 +0000 (18:44 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 7 May 2013 08:44:25 +0000 (18:44 +1000)
commit78776096e605e2cbcddeb7e4a022e4a38c8c67f6
tree4bc97cc23e8bdafdca66f3da1b08ad90aecf8367
parent40eb151be5ea5fca60d5919c7053848a2c7ba248
parentbf83d4469f1ac84d58e7ebae155274c4686eefea
Merge branch 'master' into Mario/monsters
25 files changed:
gamemodes.cfg
qcsrc/client/View.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qc
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_towerdefense.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/vehicles/vehicles.qc