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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp

2013-07-24 03:21:25 +02:00

..

BlackfathomDeeps

Scripting/Black Fathom Deeps: Fixed script to use proper spell.

2013-07-15 15:15:23 -02:30

CavernsOfTime

Scripted: Add some missing override

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

Firelands

Scripted: Add some missing override

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

HallsOfOrigination

Scripted: Add some missing override

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

Maraudon

Scripted: Some cleanups + ninja changes

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

OnyxiasLair

Scripts/Onyxia's Lair: Fixed movement during flight phase and set proper InhabitType

2013-07-23 17:18:46 +02:00

RazorfenDowns

DB/Gossip: Add and fix a few more gossip menus.

2013-07-15 19:57:18 -02:30

RazorfenKraul

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

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

RuinsOfAhnQiraj

Scripted: Some cleanups + ninja changes

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

TempleOfAhnQiraj

Scripted: Some cleanups + ninja changes

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

WailingCaverns

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

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

ZulFarrak

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +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-06-23 14:51:52 +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

Scripted: Some cleanups + ninja changes

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

zone_azuremyst_isle.cpp

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

2013-07-14 16:10:20 +01: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

Core: Fix build

2013-07-15 17:44:32 +02:00

zone_dustwallow_marsh.cpp

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

2013-07-14 16:10:20 +01: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

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

2013-07-14 16:10:20 +01:00

zone_mulgore.cpp

Core: Fix build

2013-07-15 17:44:32 +02:00

zone_orgrimmar.cpp

Scripted: Some cleanups + ninja changes

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

zone_silithus.cpp

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

2013-07-14 16:10:20 +01: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 remote-tracking branch 'origin/master' into 4.3.4

2013-07-16 14:42:38 +01: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