Merge branch 'master' into fruitiex/racefixes

diff --combined defaultXonotic.cfg
index 55499628c72cb2307a4de43e539094c314db7f44,3ac447e864691b3229548c392f10a53241b31fbe..50a7ed8a9f49fad3522be4c1c1e273eb1cccc544
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -211,7 -211,7 +211,7 @@@ seta crosshair_fireball_color_green 1.
  seta crosshair_fireball_color_blue 0.2        "crosshair color blue component to display when wielding the fireball"
  seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball"
  seta crosshair_fireball_size 1        "crosshair size when wielding the fireball"
- seta crosshair_ring_size 3    "bullet counter ring size for Rifle, velocity ring for Nex"
+ seta crosshair_ring_size 2    "bullet counter ring size for Rifle, velocity ring for Nex"
  seta crosshair_campingrifle_bulletcounter_alpha 0.15
  seta crosshair_nexvelocity_alpha 0.15
  seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
@@@ -626,7 -626,6 +626,7 @@@ set g_rc_respawn_delay 
  set g_cts_respawn_waves 0
  set g_cts_respawn_delay 0
  set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
 +set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
  
  // overtime
  seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"