Spp c97fc99e16 Merge branch 'master' into 4.3.4 ...

Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp

2012-10-30 10:30:05 +01:00

..

Auchindoun

Core/Misc: Tweaked ThreatContainer internals

2012-10-26 14:31:19 +02:00

BlackTemple

Core/Misc: Tweaked ThreatContainer internals

2012-10-26 14:31:19 +02:00

CoilfangReservoir

Core/Misc: Tweaked ThreatContainer internals

2012-10-26 14:31:19 +02:00

GruulsLair

Core/Misc: Fix some mem-leaks and uninitialized variables.

2012-08-12 20:06:12 +02:00

HellfireCitadel

Tabs to spaces...

2012-09-07 03:33:16 +01:00

TempestKeep

Merge branch 'master' into 4.3.4

2012-10-30 10:30:05 +01:00

blades_edge_mountains.cpp

Core/Misc: Use proper headers to optimize compile

2012-07-30 05:38:40 +02:00

boss_doomlord_kazzak.cpp

Core/Utilities: Use generic templates with AddPct, ApplyPct and CalculatePct

2012-10-02 12:17:42 +02:00

boss_doomwalker.cpp

Core/Misc: Use proper headers to optimize compile

2012-07-30 05:38:40 +02:00

CMakeLists.txt

Merge git://github.com/TrinityCore/TrinityCore into 4.x

2012-05-30 08:01:02 +02:00

hellfire_peninsula.cpp

Core/Logging: Add Asyncronous logging with Loggers ("What to log") and Appenders ("Where to log") system. Will allow to select to full log some parts of core while others are not even logged.

2012-08-03 14:20:18 +02:00

nagrand.cpp

Core/Misc: Use proper headers to optimize compile

2012-07-30 05:38:40 +02:00

netherstorm.cpp

Core/Misc: Add default count param to HasItemCount

2012-10-23 13:11:57 +02:00

shadowmoon_valley.cpp

Scripts/Sm: Fix quest I was a lot of things

2012-09-22 02:26:55 +01:00

shattrath_city.cpp

Core/Misc: Use proper headers to optimize compile

2012-07-30 05:38:40 +02:00

terokkar_forest.cpp

Core/Misc: Use proper headers to optimize compile

2012-07-30 05:38:40 +02:00

zangarmarsh.cpp

Core/Misc: Add default count param to HasItemCount

2012-10-23 13:11:57 +02:00