Merge branch 'master' into Mario/rifle_arena

diff --cc defaultXonotic.cfg
index 9dce045c36bd248748939b343ce808b5f4ec0a5c,66ac0b20b23ce711a0efa48b3f022781676ecbe1..3428112b113964db8af748dd7c1aa182bfde10d8
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -463,6 -463,6 +463,7 @@@ set sv_dodging_wall_dodging 0 "set to 
  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_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_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"

diff --cc qcsrc/server/autocvars.qh
index 65fd9b2e9c4b92b256df1385e040f15a88eb4e41,dead5a9d4b360d924a0642f4b21fe0161e734ccd..ef695c3186648eaf6e1800e2e0293f0f8197928b
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1110,6 -1110,6 +1110,7 @@@ float autocvar_sv_defaultplayerskin
  float autocvar_sv_dodging_delay;
  float autocvar_sv_dodging_height_threshold;
  float autocvar_sv_dodging_horiz_speed;
++float autocvar_sv_dodging_horiz_speed_frozen;
  float autocvar_sv_dodging_ramp_time;
  float autocvar_sv_dodging_sound;
  float autocvar_sv_dodging_up_speed;

diff --cc qcsrc/server/mutators/mutator_dodging.qc
index 674954efdc189fee26fc8ce8ac0767f578527a34,1d6dd911eb7f958fad79b957c120e06575433530..0101b98c5c477b1be8812ac4086023c5d8982ebf
--- 1/qcsrc/server/mutators/mutator_dodging.qc
--- 2/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@@ -33,6 -39,6 +33,10 @@@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhys
        float new_velocity_gain;
        float velocity_difference;
        float clean_up_and_do_nothing;
++      float horiz_speed = autocvar_sv_dodging_horiz_speed;
++      
++      if(self.freezetag_frozen)
++              horiz_speed = autocvar_sv_dodging_horiz_speed_frozen;
  
      if (self.deadflag != DEAD_NO)
          return 0;
@@@ -66,7 -72,7 +70,7 @@@
        if (common_factor > 1) 
                common_factor = 1;
  
--      new_velocity_gain = self.dodging_velocity_gain - (common_factor * autocvar_sv_dodging_horiz_speed);
++      new_velocity_gain = self.dodging_velocity_gain - (common_factor * horiz_speed);
        if (new_velocity_gain < 0)
                new_velocity_gain = 0;