Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

Conflicts:
	qcsrc/server/teamplay.qc

diff --cc defaultXonotic.cfg
index 084cc67f44701cdccada229f243724dc9c750cec,52c14b2be90d9f41000144d0ad6a9060b27e3e35..db0e26f35ffdf4869530f644f966a4b5eb18f1fc
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -619,15 -577,7 +577,14 @@@ seta g_keyhunt_point_leadlimit -1        "Keyh
  seta g_race_laps_limit -1     "Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  seta g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 +seta g_nexball_safepass_maxdist 5000    // Max distance to allow save fassping (0 to turn off safe passing)
 +seta g_nexball_safepass_turnrate 0.1    // How fast the safe-pass ball can habge direction
 +seta g_nexball_safepass_holdtime 0.75   // How long to remeber last teammate you pointed at
 +seta g_nexball_viewmodel_scale 0.25     // How large the ball for the carrier
 +seta g_nexball_viewmodel_offset "8 8 0" // Where the ball is located on carrier "forward right up"
 +seta g_nexball_tackling 1               // Allow ball theft?
 +
  
- seta g_ctf_win_mode 0 "0: captures only, 1: captures, then points, 2: points only"
  seta g_ctf_ignore_frags 0     "1: regular frags give no points"
  
  set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"

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

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

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

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

diff --cc qcsrc/server/teamplay.qc
index 9c10089caa508240981e781bf7f6d210188f4d8b,f0ce8fd142ec4027b10c524db8b97297a90a8968..533fe3fedfe3d60c9c6fa7c0c5004fa7816a649d
--- 1/qcsrc/server/teamplay.qc
--- 2/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -358,16 -257,12 +256,13 @@@ void InitGameplayMode(
  
        if(g_nexball)
        {
-         game = GAME_NEXBALL;
-         gamemode_name = "Nexball";
 -              fraglimit_override = autocvar_g_nexball_goallimit;
 -              leadlimit_override = autocvar_g_nexball_goalleadlimit;
 -              ActivateTeamplay();
 -              nb_init();
 -              have_team_spawns = -1; // request team spawns
 +        fraglimit_override = autocvar_g_nexball_goallimit;
 +        leadlimit_override = autocvar_g_nexball_goalleadlimit;
 +        ActivateTeamplay();
 +        have_team_spawns = -1; // request team spawns
- 
 +          MUTATOR_ADD(gamemode_nexball);
        }
 +        
  
        if(g_keepaway)
        {