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

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/common/mapinfo.qc
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
index 7d920fb0cd7f913f1d91a819b1d9fbb0a00022f4,065f93d5f946692ac4d94fe774589de45df83e2b..c60f25152dac2f23bfc4d0a0345c2fdec119ba88
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -70,13 -70,8 +70,7 @@@ float autocvar_ekg
  #define autocvar_fraglimit_override cvar("fraglimit_override")
  float autocvar_g_allow_oldnexbeam;
  float autocvar_g_antilag;
 -float autocvar_g_antilag_bullets;
  float autocvar_g_antilag_nudge;
- float autocvar_g_arena_maxspawned;
- float autocvar_g_arena_point_leadlimit;
- float autocvar_g_arena_point_limit;
- float autocvar_g_arena_roundbased;
- float autocvar_g_arena_round_timelimit;
- float autocvar_g_arena_warmup;
  float autocvar_g_balance_armor_blockpercent;
  float autocvar_g_balance_armor_limit;
  float autocvar_g_balance_armor_regen;

diff --cc qcsrc/server/bot/bot.qc
Simple merge

diff --cc qcsrc/server/command/cmd.qc
index 08bf940db062066b603f71ce925ad621cddd687f,c70ffb43e0213296a5dfbf0317e2cd7dcd21641b..363bb7c4c33bad339e121ae9e8be4456f5b546c8
--- 1/qcsrc/server/command/cmd.qc
--- 2/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@@ -150,9 -150,9 +150,9 @@@ void ClientCommand_join(float request
                {
                        if(IS_CLIENT(self))
                        {
-                               if(!IS_PLAYER(self) && !lockteams && !g_arena)
+                               if(!IS_PLAYER(self) && !lockteams)
                                {
 -                                      if(nJoinAllowed(self)) 
 +                                      if(nJoinAllowed(self))
                                        {
                                                if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
  

diff --cc qcsrc/server/command/vote.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/progs.src
Simple merge

diff --cc qcsrc/server/scores.qc
Simple merge

diff --cc qcsrc/server/spawnpoints.qc
Simple merge

diff --cc qcsrc/server/t_quake3.qc
Simple merge

diff --cc qcsrc/server/teamplay.qc
Simple merge