Nay 984e1feadf Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSocket.cpp

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

..

BlackfathomDeeps

Update copyright note for 2013.

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

CavernsOfTime

Merge branch 'master' into 4.3.4

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

Firelands

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

HallsOfOrigination

Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)

2013-01-30 11:57:02 +01:00

Maraudon

Update copyright note for 2013.

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

OnyxiasLair

Core/Scripting: Some cleanup

2013-01-07 22:48:40 -03:30

RazorfenDowns

Update copyright note for 2013.

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

RazorfenKraul

Update copyright note for 2013.

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

RuinsOfAhnQiraj

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

TempleOfAhnQiraj

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

WailingCaverns

Update copyright note for 2013.

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

ZulFarrak

Update copyright note for 2013.

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

boss_azuregos.cpp

Update copyright note for 2013.

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

CMakeLists.txt

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

2013-02-03 23:11:48 +01:00

zone_ashenvale.cpp

Core/Scripting: Rename zone scripts.

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

zone_azshara.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_azuremyst_isle.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_bloodmyst_isle.cpp

Core/Scripting: Rename zone scripts.

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

zone_darkshore.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_desolace.cpp

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

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

zone_durotar.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_dustwallow_marsh.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_felwood.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_feralas.cpp

Core/Spell: Gordunni Trap

2013-01-12 15:01:53 +01:00

zone_moonglade.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_mulgore.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_orgrimmar.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_silithus.cpp

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

zone_stonetalon_mountains.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_tanaris.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_teldrassil.cpp

Core/Scripting: Rename zone scripts.

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

zone_the_barrens.cpp

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

zone_thousand_needles.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_thunder_bluff.cpp

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

2013-02-03 01:50:51 +01:00

zone_ungoro_crater.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_winterspring.cpp

Core/Scripting: Rename zone scripts.

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