Merge remote-tracking branch 'origin/master' into samual/combined_updates

diff --combined defaultXonotic.cfg
index 53bbc5ab16b747d489f77be7f81eb67d9e11dc7f,dd16de9bc6ee4224b900bf576cfc86ff8e5fce20..e0b7b4662eea0272e667979e104eb99dee018121
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -60,8 -60,7 +60,8 @@@ seta cl_reticle_stretch 0 "whether to s
  seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
  seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
  fov 90
 -seta cl_velocityzoom 0        "velocity based zooming of fov, negative values zoom out"
 +seta cl_velocityzoom 0        "velocity based zooming of fov"
 +seta cl_velocityzoom_factor 0 "factor of fov zooming (negative values zoom out)"
  seta cl_velocityzoom_type 3 "how to factor in speed, 1 = all velocity in all directions, 2 = velocity only in forward direction (can be negative), 3 = velocity only in forward direction (limited to forward only)"
  seta cl_velocityzoom_speed 1000 "target speed for fov factoring"
  seta cl_velocityzoom_time 0.2 "time value for averaging speed values"
@@@ -465,6 -464,7 +465,7 @@@ set g_spawn_furthest 1 "this amount of 
  set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"
  // respawn delay
  set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
+ set g_respawn_delay_max 0 "number of seconds you can wait before you're forced to respawn (only effective with g_forced_respawn 1)"
  set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks"
  
  // overtime
@@@ -979,7 -979,7 +980,7 @@@ seta menu_slist_showempty 1 "show serve
  seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now".
  
  // other serverlist cvars
 -seta menu_slist_categories 1
 +seta menu_slist_categories 0
  seta menu_slist_categories_onlyifmultiple 1
  seta menu_slist_purethreshold 0
  seta menu_slist_modimpurity 0

diff --combined qcsrc/server/cl_client.qc
index 92fca7b7580e32421e053481ba8e97e213769c2d,d803602ad6ccd6c229e5b61ffa20f4dfc976b6ae..1218e8737f6816354ab9dead9b94d3d4109c6af6
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1039,7 -1039,6 +1039,7 @@@ void ClientConnect (void
                player_count = 0;
        }
  
 +        PlayerInfo_Basic(self);
        PlayerScore_Attach(self);
        ClientData_Attach();
        accuracy_init(self);
@@@ -2309,7 -2308,7 +2309,7 @@@ void PlayerPreThink (void
  
                                if (self.deadflag == DEAD_DYING)
                                {
-                                       if(self.respawn_flags & RESPAWN_FORCE)
+                                       if((self.respawn_flags & RESPAWN_FORCE) && !autocvar_g_respawn_delay_max)
                                                self.deadflag = DEAD_RESPAWNING;
                                        else if(!button_pressed)
                                                self.deadflag = DEAD_DEAD;
@@@ -2318,6 -2317,8 +2318,8 @@@
                                {
                                        if(button_pressed)
                                                self.deadflag = DEAD_RESPAWNABLE;
+                                       else if(time >= self.respawn_time_max && (self.respawn_flags & RESPAWN_FORCE))
+                                               self.deadflag = DEAD_RESPAWNING;
                                }
                                else if (self.deadflag == DEAD_RESPAWNABLE)
                                {
@@@ -2329,6 -2330,7 +2331,7 @@@
                                        if(time > self.respawn_time)
                                        {
                                                self.respawn_time = time + 1; // only retry once a second
+                                               self.respawn_time_max = self.respawn_time;
                                                respawn();
                                        }
                                }
@@@ -2337,6 -2339,8 +2340,8 @@@
  
                                if(self.respawn_flags & RESPAWN_SILENT)
                                        self.stat_respawn_time = 0;
+                               else if((self.respawn_flags & RESPAWN_FORCE) && autocvar_g_respawn_delay_max)
+                                       self.stat_respawn_time = self.respawn_time_max;
                                else
                                        self.stat_respawn_time = self.respawn_time;
                        }

diff --combined qcsrc/server/defs.qh
index 93eff518f0c3cad372896bc98ebb1d22cc231df3,72f4457d61d9fe99dff84bc1c2e728b2dcacab62..38b069a8f44fe9610ef46259505dce3104ca525a
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -104,6 -104,7 +104,7 @@@ float server_is_dedicated
  .float play_time;
  .float respawn_flags;
  .float respawn_time;
+ .float respawn_time_max;
  .float death_time;
  .float fade_time;
  .float fade_rate;
@@@ -615,12 -616,3 +616,12 @@@ string modname
  #define MISSILE_IS_CONFUSABLE(m) ((m.missile_flags & MIF_GUIDED_CONFUSABLE) ? TRUE : FALSE)
  #define MISSILE_IS_GUIDED(m) ((m.missile_flags & MIF_GUIDED_ALL) ? TRUE : FALSE)
  #define MISSILE_IS_TRACKING(m) ((m.missile_flags & MIF_GUIDED_TRACKING) ? TRUE : FALSE)
 +
 +
 +////
 +
 +.entity player_stats;
 +//.float playerid;
 +.string playernick;
 +.float elos;
 +.float ranks;

diff --combined qcsrc/server/progs.src
index 3dbdc454f0bbb4cd97ac7758605a18b65481c700,f29324a478a8e622e4b72b81d995681a01d511b4..f358a114e42341d2f19d9e28709326e44ce31b73
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -37,13 -37,12 +37,12 @@@ defs.qh            // Should rename this, it has 
  mutators/base.qh
  mutators/mutators.qh
  mutators/gamemode_assault.qh
- mutators/gamemode_arena.qh
  mutators/gamemode_ca.qh
  mutators/gamemode_ctf.qh
  mutators/gamemode_domination.qh
  mutators/gamemode_keyhunt.qh // TODO fix this
  mutators/gamemode_keepaway.qh
 -mutators/gamemode_nexball.qh 
 +mutators/gamemode_nexball.qh
  mutators/gamemode_lms.qh
  mutators/mutator_dodging.qh
  mutators/mutator_nades.qh
@@@ -73,7 -72,7 +72,7 @@@ csqceffects.q
  
  anticheat.qh
  cheats.qh
 -playerstats.qh
 +../common/playerstats.qh
  
  portals.qh
  
@@@ -220,7 -219,7 +219,7 @@@ playerdemo.q
  
  anticheat.qc
  cheats.qc
 -playerstats.qc
 +../common/playerstats.qc
  
  round_handler.qc
  
@@@ -228,7 -227,6 +227,6 @@@
  
  mutators/base.qc
  mutators/gamemode_assault.qc
- mutators/gamemode_arena.qc
  mutators/gamemode_ca.qc
  mutators/gamemode_ctf.qc
  mutators/gamemode_domination.qc