]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/Mario/arena_nuke'
authorSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 04:33:51 +0000 (23:33 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 04:33:51 +0000 (23:33 -0500)
commit04ab0ff7c3c5fcfe9780eadccfd5abd03d25b181
tree95a282e5a0e248ca4c0c36b7caf735acc6979712
parent3f195c9c45d7cbe2b7059e320f99493b433121f7
parent97e94ea0a05686d60a6f5de8d369d040005b8eb1
Merge remote-tracking branch 'origin/Mario/arena_nuke'

* origin/Mario/arena_nuke:
  Remove arena gamemode

Conflicts:
qcsrc/server/command/cmd.qc
qcsrc/server/mutators/gamemode_arena.qc
14 files changed:
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/bot.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/scores.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/t_quake3.qc
qcsrc/server/teamplay.qc