From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 1 Jul 2018 03:37:53 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c75473d8e67534114d6fd289d708773ade486e0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/master
---

1c75473d8e67534114d6fd289d708773ade486e0
diff --cc qcsrc/server/g_damage.qc
index 5e4007ab0,38284c30d..5a79ed8c1
--- a/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;