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

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/shared/Packets/ByteBuffer.h

2013-03-25 14:34:22 +01:00

..

AzjolNerub

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

2013-02-19 18:57:36 +01:00

ChamberOfAspects

Core/Misc: Minor optimizations (+code changes to reduce differences with 4.3.4 branch)

2013-03-25 13:26:48 +01:00

CrusadersColiseum

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

2013-03-20 22:07:56 +01:00

DraktharonKeep

Core/AI: Do not expose internal storage of SummonList

2013-03-21 11:06:05 +01:00

FrozenHalls

Scripts/Pit of Saron: Very minor spelling error correction.

2013-03-14 17:58:35 +00:00

Gundrak

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

IcecrownCitadel

Merge branch 'master' into 4.3.4

2013-03-25 14:34:22 +01:00

Naxxramas

Core/AI: Do not expose internal storage of SummonList

2013-03-21 11:06:05 +01:00

Nexus

Core/Misc: Minor optimizations (+code changes to reduce differences with 4.3.4 branch)

2013-03-25 13:26:48 +01:00

Ulduar

Core/AI: Do not expose internal storage of SummonList

2013-03-21 11:06:05 +01:00

UtgardeKeep

Core/Scripts: Removed CAST_CRE define

2013-03-21 13:48:36 +01:00

VaultOfArchavon

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

VioletHold

Core/AI: Do not expose internal storage of SummonList

2013-03-21 11:06:05 +01:00

CMakeLists.txt

Core/Scripting: Some file name updates.

2013-01-02 15:08:13 -03:30

isle_of_conquest.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

zone_borean_tundra.cpp

Core/Scripts: Removed CAST_CRE define

2013-03-21 13:48:36 +01:00

zone_crystalsong_forest.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_dalaran.cpp

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

2013-02-19 18:57:36 +01:00

zone_dragonblight.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_grizzly_hills.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_howling_fjord.cpp

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

zone_icecrown.cpp

Core: Fix non pch build

2013-03-08 06:20:38 +01:00

zone_sholazar_basin.cpp

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

zone_storm_peaks.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_wintergrasp.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00

zone_zuldrak.cpp

Core/Scripts: Removed useless const modifier on method parameters accepting primitive types passed by value

2013-02-19 17:35:27 +01:00