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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp

2014-09-13 22:38:25 +02:00

..

BlackfathomDeeps

Core/InstanceScript: refactored load and save methods

2014-09-07 00:42:14 +02:00

CavernsOfTime

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

2014-09-13 22:38:25 +02:00

DireMaul

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

Firelands

Core: Fix build

2014-09-07 02:35:17 +02:00

HallsOfOrigination

Core: Fix build

2014-09-07 02:35:17 +02:00

Maraudon

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

OnyxiasLair

Scripts/Onyxia Lair: Slight change so we don't call Reset() in the 'ctor

2014-09-08 18:02:06 -03:00

RagefireChasm

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

RazorfenDowns

Core/InstanceScript: refactored load and save methods

2014-09-07 00:42:14 +02:00

RazorfenKraul

Core/InstanceScript: refactored load and save methods

2014-09-07 00:42:14 +02:00

RuinsOfAhnQiraj

Core/InstanceScript: refactored load and save methods

2014-09-07 00:42:14 +02:00

TempleOfAhnQiraj

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-07 20:12:54 +02:00

WailingCaverns

Core/InstanceScript: refactored load and save methods

2014-09-07 00:42:14 +02:00

ZulFarrak

Core/InstanceScript: refactored load and save methods

2014-09-07 00:42:14 +02:00

CMakeLists.txt

Scripts: Remove old script from azuregos

2014-04-29 14:17:30 +02:00

zone_ashenvale.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_azshara.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_azuremyst_isle.cpp

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

2014-09-06 02:41:45 +02:00

zone_bloodmyst_isle.cpp

Scripts/BloodmystIsle: Fix StartUp Errors

2014-07-29 20:16:37 +02:00

zone_darkshore.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_desolace.cpp

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

2014-04-29 20:14:42 +02:00

zone_durotar.cpp

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

2014-09-06 02:41:45 +02:00

zone_dustwallow_marsh.cpp

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

2014-06-24 18:26:52 +02:00

zone_felwood.cpp

Scripting: Felwood: A little cleanup to my previous commit

2014-09-12 12:40:58 -02:30

zone_feralas.cpp

Scripts&DB/Feralas Convert npc_screecher_spirit to SAI

2014-07-24 16:38:18 +01:00

zone_moonglade.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_mulgore.cpp

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

2014-09-06 02:41:45 +02:00

zone_orgrimmar.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_silithus.cpp

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

2014-09-06 02:41:45 +02:00

zone_stonetalon_mountains.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

zone_tanaris.cpp

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

2014-09-06 02:41:45 +02:00

zone_teldrassil.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

zone_the_barrens.cpp

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

2014-09-12 20:26:46 +02:00

zone_thousand_needles.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_thunder_bluff.cpp

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

2014-09-06 02:41:45 +02:00

zone_ungoro_crater.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00

zone_winterspring.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-05 22:44:24 +02:00