Merge branch 'master' into mario/runematch_nuke

diff --cc gamemodes.cfg
Simple merge

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

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

diff --cc qcsrc/server/cl_client.qc
index a403af3292c6bf3957cdf2a213717403e1094436,356d444c0c8a46918d573da4b036756243c6b1ef..4c7d5c57564d8f7b674c610629e45faac08ab7b7
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1631,9 -1634,10 +1630,9 @@@ void ClientDisconnect (void
  
        if(autocvar_sv_eventlog)
                GameLogEcho(strcat(":part:", ftos(self.playerid)));
-       bprint ("^4",self.netname);
-       bprint ("^4 disconnected\n");
+               
+       Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, self.netname);
  
 -      DropAllRunes(self);
        MUTATOR_CALLHOOK(ClientDisconnect);
  
        Portal_ClearAll(self);

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

diff --cc qcsrc/server/cl_weaponsystem.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/progs.src
Simple merge

diff --cc qcsrc/server/teamplay.qc
index ab586a1ac4ed849303c3b618722d619e5d3575fd,a96726c5643f175174783c563ec77751deb70190..6608fc9a317e38e1e73686179016a354ecdabe45
--- 1/qcsrc/server/teamplay.qc
--- 2/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -13,45 -13,7 +13,6 @@@ void TeamchangeFrags(entity e
        PlayerScore_Clear(e);
  }
  
- vector TeamColor(float teem)
- {
-       switch(teem)
-       {
-               case COLOR_TEAM1:
-                       return '1 0.0625 0.0625';
-               case COLOR_TEAM2:
-                       return '0.0625 0.0625 1';
-               case COLOR_TEAM3:
-                       return '1 1 0.0625';
-               case COLOR_TEAM4:
-                       return '1 0.0625 1';
-               default:
-                       return '1 1 1';
-       }
- }
- 
- string TeamName(float t)
- {
-       return strcat(Team_ColorName(t), " Team");
- }
- string ColoredTeamName(float t)
- {
-       return strcat(Team_ColorCode(t), Team_ColorName(t), " Team^7");
- }
- string TeamNoName(float t)
- {
-       // fixme: Search for team entities and get their .netname's!
-       if(t == 1)
-               return "Red Team";
-       if(t == 2)
-               return "Blue Team";
-       if(t == 3)
-               return "Yellow Team";
-       if(t == 4)
-               return "Pink Team";
-       return "Neutral Team";
- }
- 
 -void runematch_init();
  void tdm_init();
  void entcs_init();