Spp 0e8011657d Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h

2013-01-16 15:29:41 +01:00

..

2012_10_15_00_world_phase_definitions_434.sql

SQL: Renamed SQL from previous merge.

2012-10-15 13:46:42 -05:00

2012_10_15_01_world_spell_script_names_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2012_10_15_02_world_spell_script_names_434.sql

Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift)

2012-10-15 18:01:16 -05:00

2012_11_17_00_world_spell_script_names_434.sql

Core/Spells: Fixed Improved Cone of Cold.

2012-11-17 14:10:47 -05:00

2012_11_20_00_world_misc_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2012_11_21_00_world_misc_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2012_11_22_00_world_command_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2012_11_25_02_world_spell_script_names_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2012_12_01_00_world_spell_script_names_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2012_12_02_00_world_spell_group_misc_434.sql

Core/Spells:

2012-12-02 15:13:50 +01:00

2012_12_24_00_world_spell_script_names_434.sql

Core/Spells: Remove spell script "spell_gen_damage_reduction_aura"

2012-12-24 17:22:33 +01:00

2012_12_24_09_world_halls_of_origination_434.sql

Scripts/HallsOfOrigination: Some work on Halls of Origination.

2012-12-24 18:25:57 -05:00

2012_12_25_01_world_halls_of_origination_434.sql

Core: Fix non pch build

2012-12-26 02:50:19 +01:00

2012_12_26_00_world_spell_script_names_434.sql

Scripts/Spells: Fixed Mage's Improved Flamestrike, Ice

2012-12-26 18:03:41 +01:00

2012_12_27_00_world_spelldifficulty_dbc_434.sql

Core/DataStores: Upgraded spelldifficulty_dbc db storage to 4.3.4

2012-12-27 15:42:42 +01:00

2012_12_27_01_world_achievement_dbc_434.sql

Core/DataStores: Upgraded achievement_dbc db storage to 4.3.4

2012-12-27 15:42:55 +01:00

2012_12_30_00_world_zul_gurub_434.sql

SQL: rename sql for 4.3.4

2012-12-31 14:15:24 +01:00

2013_01_03_00_world_spell_area_434.sql

Core/Spells: Removed no fly zone for dalaran

2013-01-03 16:58:38 +01:00

2013_01_03_01_world_spell_area_434.sql

Core/Spells: Update no fly zone for wintergrasp

2013-01-03 17:37:39 +01:00

2013_01_04_00_world_halls_of_origination_434.sql

Scripts/HallsOfOrigination: Added script for Anraphet and the Vault of Lights.

2013-01-04 18:07:56 -05:00

2013_01_05_00_world_firelands_434.sql

SQL: Rename some SQLs for 4.3.4 branch in correct name

2013-01-14 14:42:54 +01:00

2013_01_14_00_world_version.sql

TDB 335.50 - 2013/01/14

2013-01-13 18:53:32 +00:00

2013_01_14_01_world_game_event.sql

DB/Game Event: Update some game events start time for 2013

2013-01-14 12:07:37 +01:00

2013_01_14_02_world_ip2nationcountries.sql

DB/Schema: rename ip2nationcountries to ip2nationCountries (Linux)

2013-01-14 14:37:07 +00:00

2013_01_14_03_world_lefty_loosy_righty_tighty.sql

SQL: Fix sql import problem

2013-01-15 12:04:46 +01:00

2013_01_15_00_world_creature.sql

DB/Creature: Add Missing spawn for Lunk-tusk

2013-01-15 12:29:50 +01:00

2013_01_15_01_world_misc.sql

Core/Scripting: Bosses should now work in ZG.

2013-01-15 13:23:33 -03:30

2013_01_15_02_world_game_event.sql

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

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

2013_01_15_03_world_misc.sql

SQL: Fix sql import problems

2013-01-15 23:22:18 +01:00

2013_01_15_04_world_game_event.sql

DB/Game Event: Add missing changes in 6428af8f16

2013-01-15 22:53:30 +01:00

2013_01_15_05_world_creature_addon.sql

Core/Zul'Grub: Fix up Mandokir Boss

2013-01-16 00:41:03 -03:30

2013_01_15_06_world_spell_script_names.sql

Core/Zul'Grub: Fix up Mandokir Boss

2013-01-16 00:41:03 -03:30