Merge branch 'master' into terencehill/ca_arena_mutators

Conflicts:
	qcsrc/server/arena.qc
	qcsrc/server/cl_client.qc
	qcsrc/server/progs.src

diff --cc gamemodes.cfg
Simple merge

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

diff --cc qcsrc/client/autocvars.qh
Simple merge

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

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

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
index ae5d8406d8d2e109c9649bc6683cd9a6d7aff970,4c7d5c57564d8f7b674c610629e45faac08ab7b7..54b3efff8de82a1755ed1b411cc79dadd892c746
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -401,25 -401,6 +401,24 @@@ void PutObserverInServer (void
                WriteEntity(MSG_ONE, self);
        }
  
-       DropAllRunes(self);
 +      if(g_lms)
 +      {
 +              // Only if the player cannot play at all
 +              if(PlayerScore_Add(self, SP_LMS_RANK, 0) == 666)
 +                      self.frags = FRAGS_SPECTATOR;
 +              else
 +                      self.frags = FRAGS_LMS_LOSER;
 +      }
 +      else if((g_race && g_race_qualifying) || g_cts)
 +      {
 +              if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
 +                      self.frags = FRAGS_LMS_LOSER;
 +              else
 +                      self.frags = FRAGS_SPECTATOR;
 +      }
 +      else
 +              self.frags = FRAGS_SPECTATOR;
 +
        MUTATOR_CALLHOOK(MakePlayerObserver);
  
        minstagib_stop_countdown(self);

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

diff --cc qcsrc/server/defs.qh
Simple merge

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

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

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

diff --cc qcsrc/server/mutators/base.qh
Simple merge

diff --cc qcsrc/server/progs.src
index 03326da8436610985d732af71a64ceb08a1500c8,f33be85b9b4c3816451ef7de35efe6492e91800a..bb23eb68e6d9dc31d846c6a8aa206a7347cda56b
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -105,7 -101,8 +105,7 @@@ g_subs.q
  
  g_tetris.qc
  
- runematch.qc
+ //runematch.qc
 -arena.qc
  
  g_violence.qc
  g_damage.qc

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

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