Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,630 Commits 4 Branches 146 Tags
a1f59c9d8d9351bd4373e1e4355eee09369c589f
Commit Graph

9106 Commits

Author SHA1 Message Date
DDuarte
a1f59c9d8d TDB 6.04 - 2016/04/11 2016-04-11 02:42:03 +01:00
DDuarte
580773dc1a DB/Creature: More exterminations 
This time in the Halls of Anguish in Black Temple
ALso script Mutant War Hound
(cherry picked from commit f93d91aa1b)

# Conflicts:
#	sql/updates/world/2016_04_10_00_world.sql
 2016-04-11 01:24:59 +01:00
MitchesD
e7ea44cdb2 DB/Creature: fixed few spawns masks from recent commits 2016-04-10 16:37:10 +02:00
Shauren
f41b9484b7 SQL import fix 2016-04-10 15:28:03 +02:00
treeston
6dfe9d34f3 Merge branch '3.3.5-naxxcleanup' into 3.3.5. (PR #16524) 
(cherry picked from commit f37682b7ed)
 2016-04-10 15:27:49 +02:00
Dr-J
280f1258f8 DB/Misc: More Hellfire fixes 
1) Rescript Natural Remedies with all visuals and event rather than only spawning Goliathon
2) Raging Colossus will now summon Raging Shardling
3) Added missing spells to event with Earthbinder Galandria when the Earthbinder is turned in, also ensuring that the whisper takes places when quest taken from Tola'thion
(cherry picked from commit 7f00d185f4)
 2016-04-10 14:41:26 +02:00
Dr-J
6c91baf86f DB/Quest: Taken in the Night 
CPP > SAI conversion of script for http://www.wowhead.com/quest=10873/taken-in-the-night

Also closes #16098
(cherry picked from commit 546c8a5b8e)
 2016-04-10 14:41:01 +02:00
Killyana
d0dce8c8dd DB/Creature: Fix some DB errors 2016-04-10 14:34:20 +02:00
treeston
c344feed96 Merge branch '3.3.5-horsemen' into 3.3.5-base (PR #16194) 
(cherry picked from commit e8a79737a5)
 2016-04-10 14:32:51 +02:00
treeston
43c3b1b2e0 Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142) 
(cherry picked from commit d23ef5d6d0)
 2016-04-10 14:01:37 +02:00
Dr-J
9fc090881b DB/Misc: Fix errors 
Fix startup errors introduced with 83efabefe8
(cherry picked from commit bea174e998)
 2016-04-10 12:37:50 +02:00
Dr-J
c4683842d5 DB/Misc: Flight Master SAI 
Use proper spells to summon enraged wyverns, gryphons, hippogryphs and felbats instead of directly summoning with SAI action 12, also remove second line of all scripts as all of these used 2 lines of sai to summon two npcs on agro, the spells summon 2 in one cast so only one line needed.
(cherry picked from commit 83efabefe8)
 2016-04-10 12:36:48 +02:00
Shauren
46a75bae00 DB/SAI: Underbog Colossus 
http://www.wowhead.com/npc=21251/underbog-colossus#comments

Add missing on death events, previously when killed these always cast toxic pool

When killed now one of the following will happen

* Nothing
* Spawn Toxic Pool
* Spawn 2 Colossus Lurker http://www.wowhead.com/npc=22347/colossus-lurker#comments
* Spawn around 10 of Colossus Rager http://www.wowhead.com/npc=22352/colossus-rager#comments
(cherry picked from commit 3c4f435629)
 2016-04-10 12:34:36 +02:00
jackpoz
d9b8125ca5 Merge PR #14824 'tkrokli/spell_mod_stealth_stand_state' into 3.3.5 
(cherry picked from commit 1511855fea)
 2016-04-10 12:27:21 +02:00
Killyana
1747eec6be DB/Misc: Shadowfang Keep Heroic Updates 2016-04-10 03:59:11 +02:00
Killyana
ccd748f3bc DB/Misc: Fix Hero's call boards 2016-04-10 03:28:13 +02:00
Killyana
0b72b6a893 DB/Event: Add missing objects for Love is in the Air world event - In following zones Exodar, Darnassus, Iron Forge, Stormwind, Moonglade, Outlands(includes Shattrath), Northrend (includes Dalaran) (1941 objects in total are added). 
Cherry Picks from 0cdea48891
 2016-04-10 02:40:54 +02:00
Killyana
cf6f5fab53 DB/Event: Add all missing Lunar Festival Objects in Exodar, Darnassus, Iron Forge 
Cherry picks from 6f75bf9e0b
 2016-04-10 02:05:48 +02:00
Killyana
4c9d1871d7 DB/Creature: Add pathing for Moonglade Warden & update aura's for Manifest Nightmare & Phantasmal Lash 
Cherry Picks from 2a76b18d11
 2016-04-09 23:41:20 +02:00
Shauren
348eac096d SQL import fix 2016-04-09 23:35:59 +02:00
Killyana
35b5ef9fc9 DB/Event: Add all Lunar Festival Objects & SAI in Moonglade 
And restore deleted objects
Cherry Picks from 61ec77c878
6ca400b35e
 2016-04-09 23:32:31 +02:00
Killyana
fc41b8ac4e DB/Event: Add missing Commoner for Winter Winter Veil 
Cherry Picks from e6a7818a9a
 2016-04-09 21:28:58 +02:00
Killyana
c677a82409 DB/Creature: Add pooling for Ethereum Jailor 
Cherry Picks from 8a2a129d35
 2016-04-09 20:57:38 +02:00
Killyana
89cabacbc0 DB/Event: Add missing Feast of Winter Veil spawns in Eastern Kingdoms 
Cherry Picks from 97f06d07cb
 2016-04-09 20:26:27 +02:00
Killyana
e101961823 DB/Event: Add missing Feast of Winter Veil spawns in Azuremyst Isle (Exodar) 
Cherry Picks
 2016-04-09 20:01:42 +02:00
Killyana
c8ae1425e4 DB/Event: Add missing Feast of Winter Veil spawns in Silvermoon 
Cherry Picks
 2016-04-09 19:49:28 +02:00
Killyana
662ebf6b02 DB: Typo 2016-04-09 19:41:05 +02:00
Killyana
9d07920cbb DB/Creature: Bro'Gaz the Clanless 
Cherry Picks
 2016-04-09 19:38:31 +02:00
Killyana
7f7bb806fa DB/Event: Additional Feast of Winter Veil gameobject & creature fixes 
Cherry picks
 2016-04-09 19:30:14 +02:00
Killyana
ee4da291b9 DB/Creature: Remove a wrong spawn and fix Lunchbox react state 2016-04-09 19:15:05 +02:00
Shauren
d9c4f6574a SQL import fix 2016-04-09 19:09:47 +02:00
Killyana
ec61448153 DB/Creature: Skyguard Handler/Skyguard Nether Ray Waypoint 2016-04-09 19:06:55 +02:00
Killyana
cfe684587d DB/Creature: Wyrmcaller Vile 2016-04-09 18:58:27 +02:00
Killyana
a3a5f7ad93 DB/Conditions: Add target for "Collect Data" and "Bluff" used by Iron Golem 2016-04-09 18:43:26 +02:00
Killyana
2922b00aa6 DB/Faction: Fix Rivern Frostwind Faction change issue 
And fix a DB error
By @meji46
Closes #16761

(cherry picked from commit 697749aafc)
 2016-04-09 18:01:29 +02:00
Aokromes
d5d06cadf7 DB/Misc: Fix startup error (cherry picked from commit f0ee67e210) 2016-04-09 17:58:08 +02:00
Dr-J
911611466b DB/Quest: The Seer's Relic 
Closes #16923
(cherry picked from commit 76e4d418f4)
 2016-04-09 17:57:34 +02:00
Killyana
4d555daafc DB: Fix a DB error 
(cherry picked from commit 7834d339ad)
 2016-04-09 17:56:32 +02:00
Dr-J
fd9fdcd6a7 DB/Misc; corrections (cherry picked from commit d59e1b2a29) 2016-04-09 17:56:00 +02:00
Dr-J
5d2b88cbec DB/Quest: Fhwoor Smash! 
Closes #16850
(cherry picked from commit 4546fa118f)
 2016-04-09 17:55:18 +02:00
treeston
88268a9dbd DB/Gameobject: Fix respawn time for quest GO "Daggerfen Poison Manual" 
(cherry picked from commit 476eb19f21)
 2016-04-09 17:54:21 +02:00
Dr-J
7aa526e4d5 DB/Misc; Updates 
1) "Crowleg" Dan closes #16903
2) Dead Man's Debt closes #16902
3) Proto-Drake egg closes #16900
(cherry picked from commit 7491caca88)
 2016-04-09 17:53:38 +02:00
treeston
dbf97bbfbf DB/Creature: Remove a duplicate spawn 
(cherry picked from commit a189da7108)
 2016-04-09 17:52:03 +02:00
Dr-J
c2014301de DB/Misc: Misc Updates 
1) Despawn npcs summoned by flight masters when ooc
2) Demon Portal Guardian Script by @Kodekc
3) Correct Broadcast text id for Vim'gol the Vile by @tkrokli closes #16882
(cherry picked from commit 9ed4bb4ad1)
 2016-04-09 17:49:48 +02:00
Dr-J
f8fea0af41 DB/Misc: Exterminate some NPCS 
Closes #16891

Condition is to shut up Wintersorn Berserker which otherwise still speaks ooc.
(cherry picked from commit 1f7d6ee93a)
 2016-04-09 17:48:36 +02:00
Dr-J
38b2339c95 DB/Misc: Grizzly Hills 
* Few Updates for Grizzly Hills Giant and Runed Giant so these actually enter into combat and fight each other
* Grizzly Hills Giants above Thor Modan will throw the occasional tree as well as boulders
* Player texts for the Runic Prophecys
(cherry picked from commit ddb5c0bf96)
 2016-04-09 17:46:28 +02:00
Dr-J
6ebb69b3f0 DB/Creature: Recruitment Officer Carven 
Script http://www.wowhead.com/npc=25222/recruitment-officer-carven
(cherry picked from commit 3a2dd76de2)
 2016-04-09 17:44:55 +02:00
Kittnz
a4c223a300 Pet/Misc: Implement Baby Blizzard Bear 
(cherry picked from commit 8d992a888c)
 2016-04-09 17:42:50 +02:00
Aokromes
7724a7ec54 DB/Misc: Fix startup error 
(cherry picked from commit 4afea55b2c)
 2016-04-09 17:41:36 +02:00
Shauren
07a0a57ffb Merge pull request #16848 from P-Kito/debuff_remove 
[3.3.5/6.x] Scripts/Spells: Add generic spell to handle ClearDebuffs spell
(cherry picked from commit b2bd181a5f)
 2016-04-09 17:40:20 +02:00