From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 14 Aug 2018 16:00:41 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/okc3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1b5193fe8388812267a165c966d7eeeea47d72a;p=xonotic%2Fxonotic-data.pk3dir.git

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

a1b5193fe8388812267a165c966d7eeeea47d72a
diff --cc qcsrc/server/g_damage.qc
index 5e4007ab0,a25ae5bec..0dc18866d
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -602,15 -562,11 +562,17 @@@ 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)
+ void Damage(entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
  {
  	float complainteamdamage = 0;
  	float mirrordamage = 0;