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

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp

2014-04-25 23:42:40 +02:00

..

AlteracValley

Core/Misc: Fix some static analysis issues

2014-03-22 14:54:32 +01:00

BaradinHold

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

2014-04-25 23:42:40 +02:00

BlackrockMountain

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

2014-04-19 22:49:25 +02:00

Deadmines

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

Gnomeregan

Scripts/Gnomeregan: moved Blastmaster Emi gossip to db

2014-04-21 21:39:51 +02:00

Karazhan

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

2014-04-25 23:42:40 +02:00

MagistersTerrace

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

ScarletEnclave

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

2014-04-20 11:33:40 +02:00

ScarletMonastery

Core/Misc: Fix some static analysis issues

2014-03-22 14:54:32 +01:00

Scholomance

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

ShadowfangKeep

Scripts: Gossip can crash with null instance

2014-01-24 17:08:17 +01:00

Stratholme

Core/Misc: Change how Position struct is retrieved

2014-04-25 21:19:30 +02:00

SunkenTemple

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

SunwellPlateau

Core/Misc: Check GetVictim() for NULL before dereferencing it

2014-04-20 00:38:25 +02:00

TheStockade

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

Uldaman

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

ZulAman

Core/Misc: Check GetVictim() for NULL before dereferencing it

2014-04-20 00:38:25 +02:00

ZulGurub

Core/Misc: Ensure GetVictim() returns a valid reference when expected

2014-04-19 21:48:22 +02:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_alterac_mountains.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_arathi_highlands.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_blasted_lands.cpp

Core/Scripts: Move 'npc_deathly_usher' scripts to SAI.

2014-03-20 20:29:06 +02:00

zone_burning_steppes.cpp

Fix non pch build

2014-01-12 02:02:02 +01:00

zone_duskwood.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_eastern_plaguelands.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_eversong_woods.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_ghostlands.cpp

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

2014-04-05 20:43:05 +02:00

zone_hinterlands.cpp

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

2014-04-25 23:42:40 +02:00

zone_ironforge.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_isle_of_queldanas.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_loch_modan.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_redridge_mountains.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_silverpine_forest.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_stormwind_city.cpp

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

2014-01-24 19:36:32 +01:00

zone_stranglethorn_vale.cpp

Core/Misc: Ensure GetVictim() returns a valid reference when expected

2014-04-19 21:48:22 +02:00

zone_swamp_of_sorrows.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_tirisfal_glades.cpp

[TW278] - Core/Scripts: Prevent multiple spawns of Ulag

2014-04-11 22:36:38 +02:00

zone_undercity.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_western_plaguelands.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_westfall.cpp

Core/Scripts: Move 'The Defias Traitor' script to SAI

2014-03-18 08:31:23 +02:00

zone_wetlands.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00