Merge branch 'master' of github.com:KayenEQ/Server into KayenEQ-master

Conflicts:
	changelog.txt
This commit is contained in:
Michael Cook (mackal)
2014-03-05 19:49:59 -05:00
7 changed files with 74 additions and 28 deletions
+1
View File
@@ -601,6 +601,7 @@ public:
void MeleeLifeTap(int32 damage);
bool PassCastRestriction(bool UseCastRestriction = true, int16 value = 0, bool IsDamage = true);
bool ImprovedTaunt();
bool TryRootFadeByDamage(int buffslot);
void ModSkillDmgTaken(SkillUseTypes skill_num, int value);
int16 GetModSkillDmgTaken(const SkillUseTypes skill_num);