Merge remote-tracking branch 'origin/Mario/gameover_fixes'

diff --combined defaultXonotic.cfg
index 3b3e48b620dfb44c67d77f686452699ac5693dc0,9a136cdae2e26da44ef1d72a506e506035b8b6ec..7af1e09ebeebf6b9ec7f44dd8269800e96d47566
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -784,8 -784,6 +784,8 @@@ seta cl_damagetext_alpha_lifetime "3" "
  seta cl_damagetext_velocity "0 0 20" "Damage text move direction"
  seta cl_damagetext_offset "0 -40 0" "Damage text offset"
  seta cl_damagetext_accumulate_range "30" "Damage text spawned within this range is accumulated"
 +seta cl_damagetext_friendlyfire "1" "Show damage text for friendlyfire too"
 +seta cl_damagetext_friendlyfire_color "1 0 0" "Damage text color for friendlyfire"
  
  set sv_itemstime 1 "enable networking of left time until respawn for items such as mega health and large armor"
  
@@@ -1007,8 -1005,6 +1007,8 @@@ seta menu_cdtrack "rising-of-the-phoeni
  
  set sv_maxidle 0 "kick players idle for more than this amount of time in seconds"
  set sv_maxidle_spectatorsareidle 0 "when sv_maxidle is not 0, assume spectators are idle too"
 +set sv_maxidle_slots 0 "when not 0, only kick idlers when this many or less player slots are available"
 +set sv_maxidle_slots_countbots 1 "count bots as player slots"
  
  // these entities are not referenced by anything directly, they just represent
  // teams and are found by find() when needed
@@@ -1197,6 -1193,7 +1197,7 @@@ seta cl_forcemyplayermodel "" "set to t
  seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
  seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
  seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag"
+ seta cl_movement_intermissionrunning 0 "keep velocity after the match ends, players may appear to continue running while stationary"
  
  // campaign internal, set when loading a campaign map1G
  set _campaign_index ""