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

Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.h

2013-02-15 14:23:21 +01:00

..

AzjolNerub

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

2013-02-09 20:33:30 +00:00

ChamberOfAspects

Core: Clean up whitespace, and remove a silly warning in boss_lurker_below.cpp

2013-02-07 00:19:19 +01:00

CrusadersColiseum

Merge branch 'master' into 4.3.4

2013-02-05 09:57:14 +01:00

DraktharonKeep

Fix non PCH build

2013-01-05 19:10:18 +01:00

FrozenHalls

Core: Logical fixes and improvements in EventMap

2013-01-30 18:39:34 +01:00

Gundrak

Scripts/Gundrak: Drakkari Colossus

2013-02-14 22:54:06 +02:00

IcecrownCitadel

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

2013-02-12 21:21:06 +01:00

Naxxramas

Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

2013-02-04 19:18:48 -03:00

Nexus

Merge branch 'master' into 4.3.4

2013-02-05 09:57:14 +01:00

Ulduar

Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

2013-02-04 19:18:48 -03:00

UtgardeKeep

Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

2013-02-04 19:18:48 -03:00

VaultOfArchavon

Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

2013-02-04 19:18:48 -03:00

VioletHold

Core/Scripting: Misc Cleanup.

2013-01-13 01:38:28 -03:30

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/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

2013-02-04 19:18:48 -03:00

zone_crystalsong_forest.cpp

Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

2013-02-04 19:18:48 -03:00

zone_dalaran.cpp

Merge branch 'master' into 4.3.4

2013-02-05 09:57:14 +01:00

zone_dragonblight.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_grizzly_hills.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_howling_fjord.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_icecrown.cpp

Core: Clean up whitespace, and remove a silly warning in boss_lurker_below.cpp

2013-02-07 00:19:19 +01:00

zone_sholazar_basin.cpp

Core/Scripting: Implement quest Reconnaissance Flight (id 12671)

2013-01-15 21:56:20 +02:00

zone_storm_peaks.cpp

Core/Misc: Apply codestyle to multiple files

2013-01-14 09:50:59 +01:00

zone_wintergrasp.cpp

Core/Misc: Apply codestyle to multiple files

2013-01-14 09:50:59 +01:00

zone_zuldrak.cpp

Fix nonpch build and warning. Move script to spell_quest.cpp

2013-01-13 15:37:01 +01:00