Commit Graph

5609 Commits

Author SHA1 Message Date
Spp
990e4c7851 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Grids/Notifiers/GridNotifiers.h
	src/server/game/Grids/ObjectGridLoader.h
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2013-11-08 10:29:51 +01:00
Malcrom
98a7a22368 DB/Misc: Remove some unneeded creature_ai_texts and EAI. 2013-11-07 23:52:30 -03:30
Malcrom
8370f70f26 DB/Creature_text: Creature text for Mennu the Betrayer
Creature needs scripting moved from EAI to cpp.
2013-11-07 23:50:44 -03:30
Malcrom
494ea7373a DB/creature_text: Creature text for Dalliah the Doomsayer & Wrath-Scryer Soccothrates
Need someone to script these two bosses in cpp to remove them from EAI.
2013-11-07 22:47:32 -03:30
Malcrom
78786d35cb DB/Creature_text: Creature text for Wrath-Scryer Soccothrates 2013-11-07 20:16:43 -03:30
Gacko
d26bb8517c DB: Fix start up warnings 2013-11-07 11:57:40 +01:00
Malcrom
7a2a9a8d15 DB/Creature_formations: Update a few formations to not crossover at pathing endpoints. 2013-11-06 23:32:12 -03:30
Malcrom
b4a0533d81 Core/CreatureGroups: Add fields to creature_formations and code to prevent creature crossover in formations.
Wiki update and db values too follow.
2013-11-06 23:20:06 -03:30
Aokromes
a4b62d873f DB/Misc: Typo fix for Defiling Uther's Tomb
by dr-j, closes #11180
2013-11-05 15:35:58 +01:00
Aokromes
a34883b939 DB/Misc: Defiling Uther's Tomb
by dr-j, closes #2410
2013-11-04 16:37:28 +01:00
Filip
c4d9e58caf DB/Misc: Wooly Justice addition
By @untaught
2013-11-04 16:35:35 +01:00
Aokromes
b857567d85 DB/Misc: Get Stefan Vadu to reset quests for Drakuru's task when Sabotage, So Far So Bad, Hazardous Materials and Infilltrating Voltarus are taken
by dr-j, closes #11170
2013-11-04 16:29:09 +01:00
Aokromes
f771ff15e5 DB/Misc: Get Thorim to clear quests You Can't Miss Him and Battling the Elements on Quest accept of forging an alliance
by dr-j, closes #11169
2013-11-04 16:27:29 +01:00
Aokromes
f8a5b63dd4 DB/Misc: An Improper Burial
By dr-j, closes #11173
2013-11-04 16:23:38 +01:00
Kinzcool
e6c3a16aa9 DB/Creatures: Corrected the npc flags for difficulty 1 of some NPCs in IoC & added their respective "click spells". 2013-11-03 19:36:21 -05:00
Aokromes
58e9aff999 DB/Misc: Fix some startup errors 2013-11-04 01:05:49 +01:00
Aokromes
40d8f60293 Rename 2013_11_04_00_world_creature_template.sql to sql/updates/world/2013_11_04_00_world_creature_template.sql 2013-11-04 00:40:19 +01:00
Aokromes
2b812e790f Rename 2013_11_03_23_world_misc.sql to 2013_11_03_24_world_misc.sql 2013-11-04 00:39:33 +01:00
Aokromes
07dd4694ce Rename 2013_11_02_00_world_sai.sql to 2013_11_03_00_world_sai.sql 2013-11-04 00:38:30 +01:00
Aokromes
a0aff55d6e DB/Misc: Zeth'Gor Must Burn!
by untaught, closes #11167
2013-11-04 00:37:44 +01:00
Sebastian Valle
428cf6b0ee Scripts/Spells: Fixed the warlocks' Fel Flame talent, now it adds to the duration of Immolate and Unstable Affliction.
Closes #8455
2013-11-03 12:39:21 -05:00
Aokromes
bc6920a80b DB/Misc: Missing Scout
by dr-j, closes #10380
2013-11-03 17:51:09 +01:00
Aokromes
7082dc4e98 DB/Misc: Wooly Justice
original work by Trista, updated by ZxBiohazardZx, final work by FireEmerald, closes #6587
2013-11-03 16:51:47 +01:00
Aokromes
a20772929e DB/Spawn: Lordaeron Citizen
by Hobbilis, closes #7914
2013-11-03 16:43:13 +01:00
Aokromes
6613001ece DB/Misc: Argent Squire / Argent Gruntling items
by BlackangelWow, updates #4710
2013-11-03 16:02:56 +01:00
Aokromes
4ccbfe8eaa DB/Misc: Update to Vordrassil's Heart Credit 2013-11-03 15:33:00 +01:00
Aokromes
ba9b8da299 DB/Misc: Astor Hadren
by dr-j, closes #10512
2013-11-03 14:07:48 +01:00
Aokromes
00897518c9 DB/Misc: The Broken Front
by dr-j, closes #7585
2013-11-03 14:04:53 +01:00
Aokromes
6a19060632 DB/Misc: Blazerunner's Script from EAI to SAI
by dr-j, closes #10547
2013-11-03 13:52:45 +01:00
Aokromes
5f6061460e DB/Misc: Burn Skorn ,Burn / Towers of Certain Doom
by dr-j, closes #10907
2013-11-03 13:49:16 +01:00
Aokromes
56cce65db1 DB/Misc: Lupus Pupus
by dr-j, closes #10436
2013-11-03 13:38:45 +01:00
Aokromes
ce55c8b018 DB/Misc: Words for Delivery description/completion text
by Crysicle, minor fix by xjose93, closes #10609
2013-11-03 12:43:11 +01:00
Aokromes
7c7ed52a2b DB/Misc: A hero's Burden + Oracles / Frenzyheart Rep Swapping
by dr-j, minor update by untaught, closes #8710 closes #6534
2013-11-03 11:28:07 +01:00
Aokromes
1d2a070de4 Merge pull request #11165 from untaught/master
Fix quest ... Or Maybe We Don't (12138) and remove the core script
2013-11-03 01:36:08 -08:00
untaught
45e0af089c Fix quest ... Or Maybe We Don't (12138) and remove the core script 2013-11-03 11:34:20 +02:00
Aokromes
741eed4740 DB/Misc: March of the Giants
by Justiciar, closes #10246
2013-11-03 10:23:33 +01:00
untaught
316da388d5 Fix quest Redeeming the Dead (9685) and remove the core script 2013-11-03 11:17:28 +02:00
Aokromes
940e671d42 DB/Misc: Kaganishu
by untaught, closes #10704
2013-11-03 09:11:33 +01:00
Aokromes
dc8cf9f14f DB/Misc: Fix some startup errors
Note: if those mobs starts moving now needs to be properly fixed, no hacked with speed 0.
2013-11-03 09:04:32 +01:00
Aokromes
172007ba5a DB/Misc: Fix some startup errors 2013-11-03 08:30:42 +01:00
Aokromes
e766f75116 DB/SAI: Winterskorn creatures
by trista, closes #5906
2013-11-03 08:02:25 +01:00
Aokromes
b569d05c1b DB/Misc: Thistleshrub Rootshaper
by untaught, updates #10944
2013-11-03 07:51:28 +01:00
Aokromes
7cba781153 DB/SAI: Little Morsels cannot feed mobs
by dr-j, closes #10892
2013-11-03 07:49:02 +01:00
Aokromes
e6e16f377f DB/Misc: Fix Bros. Before Ho Ho Ho's
by nelegalno, closes #4332
2013-11-03 07:45:17 +01:00
Aokromes
ab396c4314 DB/Quest: Fix quest ender for To Fordragon Hold!
by dr-j, closes #5121
2013-11-03 07:21:33 +01:00
Aokromes
9065b166e5 DB/Misc: Make Caladis Brightspear visible when having proper quest
by Foldor, updates #11015
2013-11-03 06:47:29 +01:00
Aokromes
2760d19156 DB/Disables: Tempering The Blade queldalar LoS
by dr-j, closes #8920
2013-11-03 06:38:43 +01:00
Aokromes
d84bdcc1d0 DB/Misc: Lunar Festival Invitation - Teleport Moonglade
by zaphod77, updates #4945
2013-11-03 06:14:05 +01:00
Aokromes
2dd80b813e DB/Misc: Heart of the Phoenix Cooldown must ignore LoS
By mweinelt, updates #10198
2013-11-03 05:55:13 +01:00
Aokromes
8726c4dca2 DB/Gameobject: Battle plans of the Kvaldir
By Justiciar, closes #10291
2013-11-03 05:48:22 +01:00