From: Mario Date: Tue, 5 Feb 2013 10:23:45 +0000 (+1100) Subject: Merge branch 'master' into mario/monsters X-Git-Tag: xonotic-v0.8.0~241^2^2~545 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23b8d3a0e72974b6e5068a00bf9edd8788617d52;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mario/monsters --- 23b8d3a0e72974b6e5068a00bf9edd8788617d52 diff --cc qcsrc/server/mutators/mutators.qh index bfd06002e,4bdcbb282..e8a5aa8b9 --- a/qcsrc/server/mutators/mutators.qh +++ b/qcsrc/server/mutators/mutators.qh @@@ -4,7 -4,7 +4,8 @@@ MUTATOR_DECLARATION(gamemode_keepaway) MUTATOR_DECLARATION(gamemode_ctf); MUTATOR_DECLARATION(gamemode_nexball); MUTATOR_DECLARATION(gamemode_onslaught); +MUTATOR_DECLARATION(gamemode_td); + MUTATOR_DECLARATION(gamemode_domination); MUTATOR_DECLARATION(mutator_dodging); MUTATOR_DECLARATION(mutator_invincibleprojectiles); diff --cc qcsrc/server/progs.src index 6139d3371,f1bdb2443..3ac35eee2 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@@ -207,10 -207,9 +208,11 @@@ playerstats.q ../common/explosion_equation.qc +monsters/monsters.qh + mutators/base.qc mutators/gamemode_ctf.qc + mutators/gamemode_domination.qc mutators/gamemode_freezetag.qc mutators/gamemode_keyhunt.qc mutators/gamemode_keepaway.qc