Merge remote-tracking branch 'origin/3.3.5' into 4.3.4

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Instances/InstanceScript.h
	src/server/scripts/Northrend/isle_of_conquest.cpp
	src/server/shared/Database/Implementation/LoginDatabase.cpp
	src/server/shared/Database/Implementation/LoginDatabase.h
This commit is contained in:
DDuarte committed 2014-10-19 00:18:06 +01:00
commit 5bf55eacfd
39 files changed
+1593 -419

No files matched your search

@@ -247,6 +247,8 @@ class InstanceScript : public ZoneScript
// ReCheck PhaseTemplate related conditions
void UpdatePhasing();
uint32 GetEncounterCount() const { return bosses.size(); }
protected:
void SetHeaders(std::string const& dataHeaders);
void SetBossNumber(uint32 number) { bosses.resize(number); }