Merge branch 'master' into martin-t/okc2

diff --combined mutators.cfg
index 583f3d5975672689f7aeb40348db5043b86b0fcb,c57088dd92910c1e1915d8bd61ba31918b3eb085..de8faa4ff1e01315b737f09350578b1665719bd1
--- 1/mutators.cfg
--- 2/mutators.cfg
+++ b/mutators.cfg
@@@ -12,21 -12,17 +12,21 @@@ seta cl_dodging_timeout 0.2 "determine
  
  set sv_dodging_air_dodging 0
  set sv_dodging_wall_dodging 0 "allow dodging off walls"
 -set sv_dodging_delay 0.5 "determines how long a player has to wait to be able to dodge again after dodging"
 +set sv_dodging_delay 0.6 "determines how long a player has to wait to be able to dodge again after dodging"
  set sv_dodging_up_speed 200 "the jump velocity of the dodge"
 -set sv_dodging_horiz_speed 400 "the horizontal velocity of the dodge"
 -set sv_dodging_horiz_speed_frozen 200 "the horizontal velocity of the dodge while frozen"
 +set sv_dodging_horiz_speed_min 200 "the lower bound of current velocity for force scaling"
 +set sv_dodging_horiz_speed_max 1000 "the upper bound of current velocity for force scaling"
 +set sv_dodging_horiz_force_slowest 400 "the horizontal velocity of the dodge when current velocity is <= sv_dodging_horiz_speed_min, values between min and max are linearly scaled"
 +set sv_dodging_horiz_force_fastest 400 "the horizontal velocity of the dodge when current velocity is >= sv_dodging_horiz_speed_max, values between min and max are linearly scaled"
 +set sv_dodging_horiz_force_frozen 200 "the horizontal velocity of the dodge while frozen"
  set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is added smoothly (seconds)"
  set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
  set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
  set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
  set sv_dodging_frozen 0 "allow dodging while frozen"
  set sv_dodging_frozen_doubletap 0
 -set sv_dodging_maxspeed 450 "maximum speed a player can be moving at before they dodge again"
 +set sv_dodging_maxspeed 350 "maximum speed a player can be moving at to use the standard dodging from an (almost) standstill"
 +set sv_dodging_air_maxspeed 450 "maximum speed a player can be moving at before they dodge again when air dodging is enabled"
  
  
  // ===========
@@@ -468,3 -464,12 +468,12 @@@ set g_bugrigs_steer 1    "steering amount
  //  running guns
  // ==============
  set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had."
+ 
+ // ==================
+ //  dynamic handicap
+ // ==================
+ set g_dynamic_handicap 0 "Whether to enable dynamic handicap."
+ set g_dynamic_handicap_scale 0.2 "The scale of the handicap. Larger values mean more penalties for strong players and more buffs for weak players."
+ set g_dynamic_handicap_exponent 1 "The exponent used to calculate handicap. 1 means linear scale. Values more than 1 mean stronger non-linear handicap. Values less than 1 mean weaker non-linear handicap"
+ set g_dynamic_handicap_min 0 "The minimum value of the handicap."
+ set g_dynamic_handicap_max 0 "The maximum value of the handicap."