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

Conflicts:
	changelog.txt
This commit is contained in:
KayenEQ
2013-12-13 22:47:04 -05:00
8 changed files with 76 additions and 65 deletions
+1
View File
@@ -126,6 +126,7 @@ public:
void ApplyMeleeDamageBonus(uint16 skill, int32 &damage);
virtual void MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit, ExtraAttackOptions *opts = nullptr);
bool CombatRange(Mob* other);
virtual inline bool IsBerserk() { return false; } // only clients
//Appearance
void SendLevelAppearance();