Merge branch 'master' into martin-t/master

diff --cc balance-mario.cfg
Simple merge

diff --cc balance-overkill.cfg
Simple merge

diff --cc balance-xdf.cfg
Simple merge

diff --cc qcsrc/server/g_damage.qc
index 5e4007ab0a9e6a28a58216f5d3706dd8479466ac,38284c30decd8a5b3adae3fbebe9039ef7e560ef..5a79ed8c1f231ab11954ca9391b108413de177d4
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -602,14 -562,10 +562,16 @@@ void Unfreeze(entity targ
        if(targ.iceblock)
                delete(targ.iceblock);
        targ.iceblock = NULL;
+ 
+       MUTATOR_CALLHOOK(Unfreeze, targ);
  }
  
 +float autocvar_g_balance_damagepush_scaling_speed_min;
 +float autocvar_g_balance_damagepush_scaling_speed_max;
 +float autocvar_g_balance_damagepush_scaling_reduction_slowest;
 +float autocvar_g_balance_damagepush_scaling_reduction_fastest;
 +float autocvar_g_balance_damagepush_scaling_sideways;
 +float autocvar_g_balance_damagepush_scaling_vertical;
  void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
  {
        float complainteamdamage = 0;

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge