Merge branch 'master' into Mario/rifle_arena

diff --cc defaultXonotic.cfg
index 09e3d18527611439296e59692cc4058203f5e857,66ac0b20b23ce711a0efa48b3f022781676ecbe1..9dce045c36bd248748939b343ce808b5f4ec0a5c
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -467,6 -467,6 +467,7 @@@ set sv_dodging_ramp_time 0.1 "a ramp s
  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"

diff --cc qcsrc/common/notifications.qh
index 6b4c339740f8b5e9b4da8f5de15ffcaeaf996dd0,9bd8d5e32f4d3a8fd116054977b071aaf1ae3404..d85c1911e0415f728b8465a03a33da372bface8b
--- 1/qcsrc/common/notifications.qh
--- 2/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@@ -261,9 -261,8 +261,9 @@@ void Send_Notification_WOVA
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_CHEAT,             3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_death",         _("^BG%s%s^K1 was unfairly eliminated by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_DROWN,             3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_water",         _("^BG%s%s^K1 was drowned by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FALL,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_fall",          _("^BG%s%s^K1 was grounded by ^BG%s^K1%s%s\n"), "") \
-       MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FIRE,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_death",         _("^BG%s%s^K1 was burnt up into a crisp by ^BG%s^K1%s%s\n"), _("^BG%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s%s\n")) \
+       MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FIRE,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_death",         _("^BG%s%s^K1 was burnt up into a crisp by ^BG%s^K1%s%s\n"), _("^BG%s%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s%s\n")) \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_LAVA,              3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_lava",          _("^BG%s%s^K1 was cooked by ^BG%s^K1%s%s\n"), "") \
 +      MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_NADE_NORMAL,       3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_death",         _("^BG%s%s^K1 was blown up by ^BG%s^K1's nade%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SHOOTING_STAR,     3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_shootingstar",  _("^BG%s%s^K1 was shot into space by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SLIME,             3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_slime",         _("^BG%s%s^K1 was slimed by ^BG%s^K1%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SWAMP,             3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",  "notify_slime",         _("^BG%s%s^K1 was preserved by ^BG%s^K1%s%s\n"), "") \

diff --cc qcsrc/server/autocvars.qh
index aef2ece8a755ff96223661fc3c6753ae7f79da3a,e6a242a70454a714e47bfbeeb151a875b45789d4..65fd9b2e9c4b92b256df1385e040f15a88eb4e41
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1115,6 -1115,6 +1115,7 @@@ 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;

diff --cc qcsrc/server/cl_physics.qc
index 5ce7b7d475f4d6848442b8fa9761106e5927ed2c,5ce7b7d475f4d6848442b8fa9761106e5927ed2c..02a3b1c0956b190bff9d1f68ba3c9d805bfd68f4
--- 1/qcsrc/server/cl_physics.qc
--- 2/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@@ -23,7 -23,7 +23,7 @@@ When you press the jump ke
  */
  void PlayerJump (void)
  {
--      if(self.freezetag_frozen)
++      if(self.freezetag_frozen && !self.dodging_action)
                return; // no jumping in freezetag when frozen
  
        float mjumpheight;

diff --cc qcsrc/server/mutators/gamemode_freezetag.qc
index 82147826ee56345cad3162601515a20c05e631db,82147826ee56345cad3162601515a20c05e631db..f2923d5434584e0eeebb2dbc40b5f8858bd82ca6
--- 1/qcsrc/server/mutators/gamemode_freezetag.qc
--- 2/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@@ -523,7 -523,7 +523,15 @@@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPh
  {
        if(self.freezetag_frozen)
        {
--              self.movement = '0 0 0';
++              if(autocvar_sv_dodging_frozen)
++              {
++                      self.movement_x = bound(-5, self.movement_x, 5);
++                      self.movement_y = bound(-5, self.movement_y, 5);
++                      self.movement_z = bound(-5, self.movement_z, 5);
++              }
++              else
++                      self.movement = '0 0 0';
++                      
                self.disableclientprediction = 1;
        }
        return 1;

diff --cc qcsrc/server/mutators/mutator_dodging.qc
index 1d6dd911eb7f958fad79b957c120e06575433530,1d6dd911eb7f958fad79b957c120e06575433530..674954efdc189fee26fc8ce8ac0767f578527a34
--- 1/qcsrc/server/mutators/mutator_dodging.qc
--- 2/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@@ -16,17 -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;

diff --cc qcsrc/server/mutators/mutator_dodging.qh
index 8e8be2513d49f90c1a952685ef6e21ae03a49940,8e8be2513d49f90c1a952685ef6e21ae03a49940..9840325d97ce8a0ee71ac932242de069a0e3cabf
--- 1/qcsrc/server/mutators/mutator_dodging.qh
--- 2/qcsrc/server/mutators/mutator_dodging.qh
+++ b/qcsrc/server/mutators/mutator_dodging.qh
@@@ -1,2 -1,2 +1,7 @@@
  float g_dodging;
  
++// set to 1 to indicate dodging has started.. reset by physics hook after dodge has been done..
++.float dodging_action;
++
++// the jump part of the dodge cannot be ramped
++.float dodging_single_action;