Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 15 Sep 2013 07:14:33 +0000 (17:14 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 15 Sep 2013 07:14:33 +0000 (17:14 +1000)
commit2c0e35d3ee9fe6652c9c56f29dbbf546da0043b0
tree7077ba63eb5c9af08fe3a8983763fa494b69cf38
parent89090ed86cb0cf70f8a5dd6e6ae9488d72452730
parente2d636eb8c05657a447aaec494ae580d1c31a4ba
Merge branch 'master' into Mario/monsters
22 files changed:
defaultXonotic.cfg
qcsrc/client/scoreboard.qc
qcsrc/common/command/generic.qc
qcsrc/common/monsters/monster/cerberus.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications.qh
qcsrc/server/accuracy.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.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/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/sv_main.qc
qcsrc/server/tturrets/units/unit_fusionreactor.qc
qcsrc/server/w_electro.qc