Vincent-Michael f16f427c48 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp

2013-08-18 18:13:14 +02:00

..

BlackfathomDeeps

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

CavernsOfTime

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

2013-08-10 17:58:53 +02:00

DireMaul

Core/Scripts: Placeholders for instances Maraudon and Dire Maul.

2013-08-17 19:14:48 +03:00

Firelands

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

2013-08-10 17:58:53 +02:00

HallsOfOrigination

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

2013-08-10 17:58:53 +02:00

Maraudon

Core/Scripts: Placeholders for instances Maraudon and Dire Maul.

2013-08-17 19:14:48 +03:00

OnyxiasLair

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

RagefireChasm

Core/Scripts: Placeholder for instance Ragefire Chasm.

2013-08-17 15:25:09 +03:00

RazorfenDowns

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

RazorfenKraul

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

RuinsOfAhnQiraj

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

TempleOfAhnQiraj

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

WailingCaverns

Scripted: Use now override for instance scripts

2013-08-10 17:42:12 +02:00

ZulFarrak

Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes

2013-08-18 01:41:10 +02:00

boss_azuregos.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

CMakeLists.txt

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

2013-08-18 18:13:14 +02:00

zone_ashenvale.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_azshara.cpp

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

2013-08-18 18:13:14 +02:00

zone_azuremyst_isle.cpp

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

2013-08-18 18:13:14 +02:00

zone_bloodmyst_isle.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

zone_darkshore.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_desolace.cpp

Scripted: Add some missing override

2013-07-15 15:14:01 +02:00

zone_durotar.cpp

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

2013-08-07 20:07:05 +02:00

zone_dustwallow_marsh.cpp

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

2013-08-07 20:07:05 +02:00

zone_felwood.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_feralas.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_moonglade.cpp

Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes

2013-08-18 01:41:10 +02:00

zone_mulgore.cpp

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

2013-08-18 18:13:14 +02:00

zone_orgrimmar.cpp

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

2013-08-18 18:13:14 +02:00

zone_silithus.cpp

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

2013-08-18 18:13:14 +02:00

zone_stonetalon_mountains.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_tanaris.cpp

Scripted: Add some missing override

2013-07-15 15:14:01 +02:00

zone_teldrassil.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_the_barrens.cpp

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

2013-08-18 18:13:14 +02:00

zone_thousand_needles.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_thunder_bluff.cpp

Scripted: Add some missing override

2013-07-15 15:14:01 +02:00

zone_ungoro_crater.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_winterspring.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00