Spp c97fc99e16 Merge branch 'master' into 4.3.4 ...

Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp

2012-10-30 10:30:05 +01:00

..

2012_09_16_00_world_version.sql

TDB 335.49 - 2012/09/15

2012-09-15 21:03:40 +01:00

2012_09_16_01_world_conditions.sql

Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling

2012-09-15 22:32:10 +02:00

2012_09_16_01_world_creature_loot_template.sql

DB/Loot: Fix typo in Ionar loot (thx DarkJaxyChan)

2012-09-15 22:38:19 +02:00

2012_09_16_01_world_creature_template_addon.sql

DB/Creatures: Fix "Frostbrood Vanquisher" flying

2012-09-15 23:20:58 +02:00

2012_09_16_02_world_fires_over_skettis.sql

DB/Spells: Fix druid's Savage Roar

2012-09-16 14:48:39 +01:00

2012_09_16_03_world_spell_script_names.sql

DB/Spells: Fix druid's Savage Roar

2012-09-16 14:48:39 +01:00

2012_09_17_00_world_spell_bonus_data.sql

DB/Spells: fix druid final lifebloom tick closes #6707 (thx diton)

2012-09-17 10:17:52 -04:00

2012_09_17_01_world_spell_bonus_data.sql

DB/Spells: fix a typo from the previous commit. im back!

2012-09-17 12:34:11 -04:00

2012_09_17_01_world_spell_script_names.sql

Core/Spells: Fixed King of the Jungle.

2012-09-17 18:17:23 +02:00

2012_09_17_02_world_misc.sql

DB/Quests: fix The Scarlet Oracle, Demetria (Closes #7773) and The Call to Command quest chain (Closes #7673)

2012-09-17 13:11:23 -04:00

2012_09_18_00_world_creature_template.sql

DB/Creatures: Update unit_flags2 for some ulduar creatures

2012-09-18 17:44:20 +02:00

2012_09_18_01_world_creature_template.sql

DB/Creatures: Update Razorscale movement

2012-09-18 18:20:49 +02:00

2012_09_19_00_world_dwarfageddon.sql

DB/Achievements: Dwarfageddon (10/25) repair previous fix

2012-09-19 21:10:58 +03:00

2012_09_19_00_world_reference_loot_template.sql

DB/Loot: Fix loot for VoA (thx to Gecko32 for the work)

2012-09-19 11:23:03 +02:00

2012_09_20_00_world_creature_loot_template.sql

DB/Loot : correct some lootids, remove pointless sharedid, Thx Kandera for the assist

2012-10-02 21:17:14 +02:00

2012_09_22_00_world_utgarde.sql

Rename SQL after PR merge

2012-09-22 02:07:19 +01:00

2012_09_22_01_world_i_was_a_lot_of_things.sql

Scripts/Sm: Fix quest I was a lot of things

2012-09-22 02:26:55 +01:00

2012_09_22_03_world_game_event.sql

[DB/GameEvents] Correct length of Brewfest event

2012-09-22 11:26:59 +02:00

2012_09_24_00_world_spell_script_names.sql

Implementing split dmg cap to Divine Sacrifice. Author Tibbi

2012-09-24 18:18:30 +03:00

2012_09_24_01_world_spell_script_names.sql

Implementing split dmg cap to Divine Sacrifice. Author Tibbi

2012-09-24 18:18:30 +03:00

2012_09_24_02_world_misc.sql

Bring Down the Warbringer! (10603) quest fix by nelegalno Closes #7840

2012-09-24 11:52:50 -04:00

2012_09_24_03_world_misc.sql

Fix bad characters in a sql file

2012-09-26 16:50:12 +01:00

2012_09_26_00_world_misc.sql

DB/Misc: fix the fix of the fix of her fix

2012-09-26 21:25:14 +01:00

2012_09_26_01_world_spell_bonus_data.sql

DB/Spells: fix startup error for death coil bonus data

2012-09-26 13:33:11 -04:00

2012_09_27_01_world_custodian_of_time.sql

Core/Script: update creature_text for Custodian of Time (quest 10277)

2012-09-27 12:45:39 -05:00

2012_09_28_00_world_creature_model_info.sql

Core/Scripts: Some fixes for Razorscale.

2012-09-28 01:37:34 +03:00

2012_09_29_00_world_creature_model_info.sql

DB/Models: Creature model updates for VoA and ToCr.

2012-09-29 19:24:29 +03:00

2012_09_29_01_world_creature_text.sql

Core/Script: update creature_text for boss Mimiron

2012-09-29 14:07:52 -05:00

2012_09_30_00_world_creature_text.sql

SQL: Rename file merged in PR; Core: cleanup whitespace and tabs

2012-09-30 15:33:56 +01:00

2012_09_30_01_world_player_factionchange_titles.sql

SQL: Rename SQL merged in PR

2012-09-30 15:43:05 +01:00

2012_09_30_02_world_creature_text.sql

DB: Fix SounID in Herald Volazj

2012-09-30 12:10:48 -04:00

2012_09_30_03_world_creature_text.sql

SQL: Rename SQL from previous merge.

2012-09-30 17:47:47 -05:00

2012_10_02_00_world_oculus.sql

Core/Oculus: Fixes here and there, implement phasing

2012-10-02 22:13:40 +03:00

2012_10_04_00_world_spelldifficulty_dbc.sql

DB/Texts: add removed texts from ab3430762d. rename another sql file

2012-10-04 10:30:49 -04:00

2012_10_04_01_world_script_texts.sql

DB/Texts: add removed texts from ab3430762d. rename another sql file

2012-10-04 10:30:49 -04:00

2012_10_05_00_world_misc.sql

Missing comma.

2012-10-05 17:16:29 +03:00

2012_10_05_01_world_spell_script_names.sql

Core/Battlefield: fix the wintergrasp and ioc teleporters.

2012-10-05 14:25:29 -04:00

2012_10_06_00_world_spell_difficulty.sql

SQL: Rename SQLs from 65c6b89d01

2012-10-06 16:44:35 +01:00

2012_10_06_00_world_spell_script_names.sql

Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.

2012-10-06 22:47:52 +02:00

2012_10_06_01_world_spell_dbc.sql

Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.

2012-10-06 22:47:52 +02:00

2012_10_06_02_world_misc_templates.sql

Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.

2012-10-06 22:47:52 +02:00

2012_10_06_03_world_creature_text.sql

Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.

2012-10-06 22:47:52 +02:00

2012_10_06_04_world_misc_spawns.sql

Fixup a guid issue in 2012_10_06_04_world_misc_spawns.sql

2012-10-07 15:01:16 +03:00

2012_10_06_05_world_spell_script_names.sql

Fixed compile and renamed one sql files

2012-10-07 00:08:04 +02:00

2012_10_07_00_world_creature_loot_template.sql

DB/Loot: increase dropchance for Plump Buzzard Wing

2012-10-07 17:43:13 +02:00

2012_10_07_01_world_spell_proc_event.sql

Make Rune of Cinderglacier not proc off dots

2012-10-07 13:44:30 +01:00

2012_10_09_00_world_spell_groups.sql

SQL/StackRules: Added a stack rule for some spells.

2012-10-09 11:01:51 -05:00

2012_10_09_01_world_spell_groups.sql

SQL/StackRules: Added one more stack rule.

2012-10-09 11:22:46 -05:00

2012_10_09_02_world_spell_groups.sql

SQL/StackRules: Added one more stack rule.

2012-10-09 12:04:04 -05:00

2012_10_10_00_world_battleground_template.sql

SQL: Renamed SQL from previous pull request.

2012-10-10 09:15:34 -05:00

2012_10_11_00_world_gameobject.sql

Wintergrasp: move keep banner spawns to db. fix invisible stalker position.

2012-10-11 11:33:22 -04:00

2012_10_13_00_world_creature_template.sql

Scripts/Ruby Sanctum:

2012-10-12 23:04:56 +02:00

2012_10_14_00_world_creature.sql

Scripts/Ruby Sanctum:

2012-10-22 21:18:21 +02: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.sql

Scripts/Spells: Updated some more spells to 4.3.4

2012-10-15 14:27:56 -05: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_10_16_00_world_spell_area.sql

Core/SpellAreas: Changed the way quest_start and quest_end works.

2012-10-16 21:44:28 -05:00

2012_10_20_00_world_transports.sql

DB: Update period timer for icecrown ship transports

2012-10-20 03:42:15 +02:00

2012_10_20_01_world_spell_script_names.sql

SQL: Typo fixes.

2012-10-24 17:36:19 +03:00

2012_10_20_02_world_creature_text.sql

Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script

2012-10-20 11:44:43 -05:00

2012_10_21_00_world_conditions.sql

SQL: Typo fixes.

2012-10-24 17:36:19 +03:00

2012_10_21_01_world_misc.sql

Core/SQL: Renamed SQL from previous merge.

2012-10-21 17:13:18 -05:00

2012_10_23_00_world_trinity_string.sql

Core/Dungeon Finder: Add debugging commands

2012-10-23 11:44:02 +02:00

2012_10_23_01_world_command.sql

Core/Dungeon Finder: Add debugging commands

2012-10-23 11:44:02 +02:00

2012_10_25_00_world_childrens_week.sql

Core/SQL: Changed codification of recent SQL file to ANSI

2012-10-25 10:54:22 -05:00

2012_10_26_00_world_sai.sql

Scripts/SAI: Fix an assert error.

2012-10-26 22:27:16 +03:00

2012_10_27_00_world_creature.sql

DB/Creatures: Correct movement for Dragonbone Condor, Carrion Condor and Courier Lanson

2012-10-27 09:42:16 +02:00

2012_10_27_01_world_creature_loot_template.sql

DB/Conditions: slightly modify the conditions for Sealed Chest: it only drops IF: you dont have it already AND you are wielding Shadowmourne AND you are on The Lich Kings Last Stand AND if you did not do Personal Property quest yet

2012-10-27 10:44:49 +02:00

2012_10_29_00_world_conditions.sql

DB/Conditions: update ItemEquipped Condition2/3 values to 0

2012-10-29 23:41:10 +01:00