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

Conflicts: src/server/game/Entities/Creature/GossipDef.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Quests/QuestDef.cpp
2011-12-06 12:01:51 +01:00
parent b0d106944b 15c24a4e97
commit fe69bd654a
27 changed files with 204 additions and 109 deletions
@@ -0,0 +1,3 @@
+DELETE FROM achievement_criteria_data WHERE criteria_id = 3693;
+INSERT INTO achievement_criteria_data VALUES
+(3693, 11, 0, 0, 'achievement_bg_control_all_nodes');
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_damage_reduction_aura' AND `spell_id`=50720;
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_vigilance';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(50720,'spell_warr_vigilance'); -- Vigilance
@@ -0,0 +1,4 @@
+DELETE FROM `gameobject` WHERE `guid` IN (207,215) AND `id`=300245; -- TEMP Forgemaster''s Anvil
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(207, 300245, 658, 3, 1, 637.954, -209.544, 533.269, 3.53903, 0, 0, 0.980321, -0.197413, 300, 0, 1),
+(215, 300245, 658, 3, 1, 726.268, -237.654, 534.13, 5.5732, 0, 0, 0.347582, -0.93765, 300, 0, 1);