Merge branch 'master' into Mario/rifle_arena

diff --combined defaultXonotic.cfg
index 9dce045c36bd248748939b343ce808b5f4ec0a5c,66ac0b20b23ce711a0efa48b3f022781676ecbe1..3428112b113964db8af748dd7c1aa182bfde10d8
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -463,11 -463,10 +463,12 @@@ 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"
  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 g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
  set g_spawn_furthest 1 "this amount of the spawns shall be far away from any players"
@@@ -1602,21 -1601,3 +1603,21 @@@ set cl_weapon_stay_color "2 0.5 0.5" "C
  set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
  
  seta g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
 +
 +set g_riflearena 0
 +set g_riflearena_nades 1
 +set g_riflearena_nade_lifetime 3.5
 +set g_riflearena_nade_damage 225
 +set g_riflearena_nade_edgedamage 90
 +set g_riflearena_nade_radius 300
 +set g_riflearena_nade_force 650
 +set g_riflearena_nade_health 25
 +set g_riflearena_nade_newton_style 0
 +set g_riflearena_nade_minforce 400
 +set g_riflearena_nade_maxforce 2000
 +set g_riflearena_nade_refire 6
 +set g_riflearena_rifle_secondary_spread 0
 +set g_riflearena_rifle_secondary_shots 1
 +set g_riflearena_rifle_secondary_animtime 0.15
 +set g_riflearena_rifle_secondary_refire 0.15
 +set g_riflearena_rifle_secondary_damage 40

diff --combined qcsrc/server/autocvars.qh
index 65fd9b2e9c4b92b256df1385e040f15a88eb4e41,dead5a9d4b360d924a0642f4b21fe0161e734ccd..ef695c3186648eaf6e1800e2e0293f0f8197928b
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1110,12 -1110,11 +1110,13 @@@ 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;
  float autocvar_sv_dodging_wall_distance_threshold;
  float autocvar_sv_dodging_wall_dodging;
 +float autocvar_sv_dodging_frozen;
  float autocvar_sv_doublejump;
  float autocvar_sv_eventlog;
  float autocvar_sv_eventlog_console;
@@@ -1166,6 -1165,7 +1167,7 @@@ float autocvar_sv_timeout_resumetime
  float autocvar_sv_vote_call;
  float autocvar_sv_vote_change;
  string autocvar_sv_vote_commands;
+ float autocvar_sv_vote_limit;
  float autocvar_sv_vote_majority_factor;
  float autocvar_sv_vote_majority_factor_of_voted;
  float autocvar_sv_vote_master;
@@@ -1234,14 -1234,3 +1236,14 @@@ float autocvar_g_touchexplode_radius
  float autocvar_g_touchexplode_damage;
  float autocvar_g_touchexplode_edgedamage;
  float autocvar_g_touchexplode_force;
 +float autocvar_g_riflearena_nades;
 +float autocvar_g_riflearena_nade_lifetime;
 +float autocvar_g_riflearena_nade_damage;
 +float autocvar_g_riflearena_nade_edgedamage;
 +float autocvar_g_riflearena_nade_radius;
 +float autocvar_g_riflearena_nade_force;
 +float autocvar_g_riflearena_nade_health;
 +float autocvar_g_riflearena_nade_newton_style;
 +float autocvar_g_riflearena_nade_minforce;
 +float autocvar_g_riflearena_nade_maxforce;
 +float autocvar_g_riflearena_nade_refire;

diff --combined 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
@@@ -16,11 -16,17 +16,11 @@@
  // and to ramp up the dodge acceleration in the physics hook.
  .float last_dodging_time;
  
 -// set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
 -.float dodging_action;
 -
  // This is the velocity gain to be added over the ramp time.
  // It will decrease from frame to frame during dodging_action = 1
  // until it's 0.
  .float dodging_velocity_gain;
  
 -// the jump part of the dodge cannot be ramped
 -.float dodging_single_action;
 -
  MUTATOR_HOOKFUNCTION(dodging_GetCvars) {
        GetCvars_handleFloat(get_cvars_s, get_cvars_f, cvar_cl_dodging_timeout, "cl_dodging_timeout");
        return 0;
@@@ -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;