Spp 5cff9e0716 Merge branch 'master' into 4.x ...

Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h

2012-02-23 13:06:35 +01:00

..

2011_11_24_01_world_command_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_24_02_world_player_xp_for_level_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_25_02_world_item_script_names_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_25_02_world_item_template_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_25_02_world_item_template_addon_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_26_02_world_quest_template_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_26_03_world_disenchant_loot_template_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_26_07_world_startinfo_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_26_08_world_creature_template_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_27_00_world_player_levelstats_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_11_28_00_world_gameobject_template_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_12_18_01_world_player_classlevelstats_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_12_18_02_world_player_levelstats_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_12_21_00_world_locales_quest_4x.sql

Change the way we deal with SQL files and merges on 4.x:

2012-01-07 17:17:13 +00:00

2011_12_26_00_world_achievement_criteria_data_4x.sql

P6: Rename 4.x sql

2012-01-08 09:39:12 +08:00

2012_01_31_01_world_hotfix_data_4x.sql

DB: 4.x database should be TDB *45* + all SQLs in sql/updates/world

2012-01-31 13:37:21 +00:00

2012_01_31_02_world_hotfix_data.sql

Core/Items: Defined "unk" field in HotfixInfo

2012-01-31 15:13:38 +01:00

2012_02_13_00_world_version.sql

TDB 335.11.46 - 2012/02/13

2012-02-12 23:50:16 +00:00

2012_02_14_00_world_achievement_criteria_data.sql

SQL/Achievements: Added difficulty conditions for Once Bitten, Twice Shy achievement

2012-02-14 10:31:31 -05:00

2012_02_15_00_world_quest_template.sql

DB/Quests: Completion and Progress texts for the quest The Power to Destroy...

2012-02-15 12:15:06 +00:00

2012_02_15_01_world_areatrigger_tavern.sql

DB/Inns: Add missing areatrigger_tavern

2012-02-15 12:19:43 +00:00

2012_02_15_02_world_item_template.sql

DB/Items: Add item_template for item Crown Chemical Co. Supplies

2012-02-15 12:36:46 +00:00

2012_02_15_03_world_quest_template.sql

DB/Quests: Completion and Progress texts for Love is in the Air quests

2012-02-15 12:41:44 +00:00

2012_02_15_04_world_quest_template.sql

DB/Quests: PrevQuestId for Love is in the Air quests

2012-02-15 12:45:32 +00:00

2012_02_15_06_world_creature_involvedrelation.sql

SQL: Fix an issue with creature guids. Please, re-apply these SQLs (2012_02_15_07_xx)

2012-02-15 15:04:06 +00:00

2012_02_15_07_00_world_creature.sql

SQL: Fix an issue with creature guids. Please, re-apply these SQLs (2012_02_15_07_xx)

2012-02-15 15:04:06 +00:00

2012_02_15_07_01_world_waypoint_data.sql

SQL: Fix an issue with creature guids. Please, re-apply these SQLs (2012_02_15_07_xx)

2012-02-15 15:04:06 +00:00

2012_02_15_07_02_world_misc.sql

SQL: Fix an issue with creature guids. Please, re-apply these SQLs (2012_02_15_07_xx)

2012-02-15 15:04:06 +00:00

2012_02_15_08_world_sai.sql

DB/SAI: Fix Ogre Pinata

2012-02-15 22:22:21 +00:00

2012_02_15_09_world_spell_proc_event.sql

Fixed proc of Misery. Thanks errodia. closes #3565

2012-02-15 20:25:51 -05:00

2012_02_16_00_world_conditions.sql

Move gossip for Lore Keeper of Norgannon to db. Remove cpp script. Also rename some incorrectly named sql updates.

2012-02-18 08:27:00 -03:30

2012_02_16_01_world_conditions.sql

Move gossip for Lore Keeper of Norgannon to db. Remove cpp script. Also rename some incorrectly named sql updates.

2012-02-18 08:27:00 -03:30

2012_02_17_00_world_waypoints.sql

Move gossip for Lore Keeper of Norgannon to db. Remove cpp script. Also rename some incorrectly named sql updates.

2012-02-18 08:27:00 -03:30

2012_02_18_00_world_spell_script_names.sql

Update file names after pull request merge.

2012-02-18 12:15:52 +01:00

2012_02_18_01_world_spell_dbc.sql

Update file names after pull request merge.

2012-02-18 12:15:52 +01:00

2012_02_18_02_world_gossip.sql

Move gossip for Lore Keeper of Norgannon to db. Remove cpp script. Also rename some incorrectly named sql updates.

2012-02-18 08:27:00 -03:30

2012_02_18_03_world_gossip.sql

DB/Gossip: Rouge & Hunter Class Trainers gossip fixup & missing gossip from Zabra'jin in Zangermarsh & Thunderlord Stronghold in Blade's Edge Mountains

2012-02-18 09:18:12 -03:30

2012_02_18_04_world_spell_script_names.sql

DB/Script Names: Fix some typos in spell_sha_healing_stream_totem

2012-02-18 16:01:15 +00:00

2012_02_18_05_world_creatures.sql

DB/NPCs: Fix MovementType & waypoints

2012-02-18 16:43:33 +00:00

2012_02_18_06_world_gossip.sql

DB/Gossip: Some missing Nagrand Gossip converted from UDB and conditions added by Pitcrawler.

2012-02-18 14:18:19 -03:30

2012_02_18_07_world_gossip.sql

DB/Gossip: Cleanup sql updates

2012-02-18 19:45:14 -03:30

2012_02_18_08_world_gossip.sql

DB/Gossip: Cleanup sql updates

2012-02-18 19:45:14 -03:30

2012_02_19_00_world_quest_template.sql

DB/Quests: Proper required races and quest relations for Shadowmourne quest line

2012-02-19 00:06:54 +00:00

2012_02_19_01_world_quest_template.sql

DB/Quests: Proper required classes for Dire Maul book quests

2012-02-19 00:08:43 +00:00

2012_02_19_02_world_gameobject.sql

DB/GOs: (Re?)Add meeting stone to UK

2012-02-19 00:27:42 +00:00

2012_02_19_03_world_warden_checks.sql

Core/Warden: Base implementation for Warden functionality

2012-02-19 13:51:16 +01:00

2012_02_19_04_world_misc_db_updates.sql

db/misc: Fix a few errors

2012-02-20 18:51:46 -03:30

2012_02_19_05_world_say_text.sql

Scripts/npc_sergeant_bly: Talk text was placholders. Replaced with Creature text.

2012-02-19 21:30:43 -03:30

2012_02_19_06_world_say_text.sql

db/text: fix talk text for Erich Lohan. Removed them from waypoints and added to SAI

2012-02-19 22:04:25 -03:30

2012_02_20_00_world_sai.sql

DB/SAI: Set a few restrictions on SMART_EVENT_UPDATE_OOC. These actions should not be performed every few milliseconds.

2012-02-20 15:35:05 +00:00

2012_02_20_01_world_misc_db.sql

db/misc: Fix a few errors

2012-02-20 18:51:46 -03:30

2012_02_20_02_world_conditons.sql

Core/Conditions: Convert npc_spellclick_spells data to condition system. This implements CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT (previous CONDITION_SOURCE_TYPE_UNUSED_18). Wiki needs to be updated accordingly.

2012-02-20 23:25:59 +01:00

2012_02_21_00_world_creature_loot_template.sql

db/loot: Fix sql add line at end.

2012-02-22 14:09:45 -03:30

2012_02_21_01_world_conditions.sql

Merge.

2012-02-21 20:17:45 +01:00

2012_02_21_02_world_creature_loot_template.sql

Renumber the file & typofix on 2012_02_21_creature_loot_template

2012-02-21 20:29:02 +01:00

2012_02_21_03_world_creature_loot_template.sql

DB/Loot: lower some green dropchances to more acceptable rate

2012-02-21 20:42:13 +01:00

2012_02_21_04_world_creature_loot_template.sql

DB/Loot: Add loot for Apprentice Osterkilgr

2012-02-21 20:44:35 +01:00

2012_02_21_05_world_Gossip_SAI.sql

Fix typo on previous commit

2012-02-21 20:07:36 -03:30

2012_02_21_06_world_Gossip.sql

db/Gossip: Some missing Gossip data from Pitcrawler & myself

2012-02-21 20:11:41 -03:30

2012_02_22_00_world_SAI.sql

db/SAI: Move Kalaran Windblade script to SAI and improved scripting and gossip.

2012-02-22 12:59:46 -03:30

2012_02_22_01_world_say_text.sql

db/text: Invisible Stalker text for Wintergrasp

2012-02-22 13:21:09 -03:30

2012_02_22_02_world_misc.sql

DB/Quests: Mounting Hodir's Helm.

2012-02-22 22:38:16 +00:00

2012_02_22_03_world_conditions.sql

DB/Conditions: Fix remaining DB sql errors

2012-02-22 23:05:31 +00:00