Nay 91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp

2012-12-27 17:52:11 +00:00

..

Accounts

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

Achievements

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Addons

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

AI

Update src/server/game/AI/CoreAI/PetAI.cpp

2012-12-22 12:01:51 -05:00

AuctionHouse

Merge branch 'master' into 4.3.4

2012-12-19 08:23:34 +01:00

Battlefield

Core/Chat: CHAT_MSG_RAID_BOSS_WHISPER also sends extra data

2012-12-23 18:31:30 -05:00

Battlegrounds

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

2012-12-27 17:52:11 +00:00

Calendar

Core/Calendar: Update calendar to 4.3.4 and enable calendar related opcodes

2012-11-21 18:01:55 +01:00

Chat

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Combat

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Conditions

Merge branch 'master' into 4.3.4

2012-12-07 09:22:43 +01:00

DataStores

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

2012-12-27 17:52:11 +00:00

DungeonFinding

Merge branch 'master' into 4.3.4

2012-12-07 09:22:43 +01:00

Entities

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

2012-12-27 17:52:11 +00:00

Events

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Globals

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

2012-12-27 17:52:11 +00:00

Grids

Scripts/HallsOfOrigination: Some work on Halls of Origination.

2012-12-24 18:25:57 -05:00

Groups

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Guilds

Core/Guilds: Fixed guild news spam related to guild level-up.

2012-12-17 00:41:46 +01:00

Handlers

Core/Vehicles: Fixed riding vehicles and mind control auras.

2012-12-25 21:50:39 -05:00

Instances

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Loot

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2012-12-23 08:33:13 -05:00

Mails

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Maps

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2012-12-23 08:33:13 -05:00

Miscellaneous

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

2012-12-27 17:52:11 +00:00

Movement

Merge branch 'master' into 4.3.4

2012-12-19 08:23:34 +01:00

OutdoorPvP

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Pools

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

PrecompiledHeaders

…

Quests

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

2012-12-27 17:52:11 +00:00

Reputation

Fix merge error

2012-11-27 15:06:40 +01:00

Scripting

Scripts/HallsOfOrigination: Added script for Earthrager Ptah.

2012-12-25 19:36:01 -05:00

Server

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

2012-12-27 17:52:11 +00:00

Skills

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Spells

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

2012-12-27 17:52:11 +00:00

Texts

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

2012-12-27 17:52:11 +00:00

Tickets

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

Tools

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2012-12-23 08:33:13 -05:00

Warden

Merge branch 'master' into 4.3.4

2012-11-16 08:51:15 +01:00

Weather

Scripts/HoO: Implemented the weather effect while on Earthrager Ptah's sandstorm.

2012-12-26 12:48:10 -05:00

World

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

2012-12-27 17:52:11 +00:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2012-11-09 14:26:27 +01:00