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,724 Commits 4 Branches 146 Tags
4f9352d7730796ad33974cedcecceb106930fc81
Commit Graph

8029 Commits

Author SHA1 Message Date
joschiwald
9fc5ea81e0 Scripts/Spells: fixed Decahedral Dwarven Dice and Worn Troll Dice 
#Closes 16866

(cherry picked from commit 029527365f)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Handlers/GroupHandler.cpp
 2016-04-23 16:54:28 +02:00
Killyana
114353f94b DB/SAI: Add immune to npc to Wintergarde Mine Bomb 
Updates #16996
 2016-04-20 19:53:36 +02:00
Killyana
1d88d049df DB: Rename file 2016-04-20 19:46:54 +02:00
Killyana
831b1db1ee DB/Creature: Trial of The Crusader Spectators cosmetics 
Updates #16994
By Nawuko
 2016-04-20 18:54:19 +02:00
Killyana
bb3f6835cf DB/Gameobject: Fix respawn time for objects used for The Alchemist's Apprentice quest 
Updates #17002
By Tauriella
 2016-04-20 18:06:41 +02:00
Killyana
395ab66755 DB/SAI: Add missing Silvermoon Magister/Gnomeregan Conjuror SAI 
Updates #17007
By Kodekc
 2016-04-20 17:31:01 +02:00
Killyana
040a54e687 DB/Quest: Bring 'Em Back Alive 
Updates #16976
 2016-04-17 17:27:28 +02:00
Killyana
1424299a11 DB/SAI: Vladek <Wolfcult Initiate> 
Updates #16980
By Kodekc
 2016-04-17 16:28:00 +02:00
Killyana
960f8c4372 DB/SAI: Rework Scourge Deathspeaker 
Updates #16985
By Kodekc
 2016-04-17 15:17:20 +02:00
Killyana
c883938bff DB/Gameobject: Fix some gameobjects respawn time 
Updates #16970 #16977 #16972 #16990
 2016-04-17 14:54:49 +02:00
Killyana
25e1ecb33d DB/Creature: Fix Leviathan Mk II health points 
Updates #16983
 2016-04-17 02:50:27 +02:00
Shauren
5d4e0e42f2 Changed supported version to 21463 2016-04-17 00:24:14 +02:00
tkrokli
d82a2cf471 Core/Scripts: zone_shattrath_city cleanup 
- restore missing text lines for Sal'salabim and Raliq the Drunk
- replace hardcoded text with DB gossip ID enum sections
- move gossip ID, quest ID, spell ID (and so on) into enum
- remove core script for Ishanah, High Priestess of the Aldor

Closes #16684

(cherry picked from commit acdfc36a4e)
 2016-04-16 19:05:32 +01:00
DDuarte
8778829a98 SQLs: Update to the /sql/updates organization 
Update SQL files should now be in a sub-folder equal to the current branch name

/sql/updates/auth/*.sql -> /sql/updates/auth/6.x/*.sql
/sql/updates/characters/*.sql -> /sql/updates/characters/6.x/*.sql
/sql/updates/hotfixes/*.sql -> /sql/hotfixes/world/6.x/*.sql
/sql/updates/world/*.sql -> /sql/updates/world/6.x/*.sql

This facilitates merges between the version branches
 2016-04-16 18:48:11 +01:00
DDuarte
4e0b0e76c9 Core/Quests Fix Quests Borrowed Technology, Volatility and The Solution Solution (#16968) 
(cherry picked from commit d1a053e4f5)

Rename sql

(cherry picked from commit 41e776fe64)
 2016-04-16 18:22:35 +01:00
DDuarte
e8179e107b Merge branch '3.3.5-gluth' into 3.3.5 (PR #14865) 
(cherry picked from commit b115458001)
 2016-04-16 18:21:22 +01:00
DDuarte
00da19ed9e Merge remote-tracking branch 'sirikfoll/geddon' into 3.3.5 (PR #16975) 
(cherry picked from commit 75f7b5ae4b)
 2016-04-16 18:20:11 +01:00
DDuarte
98a8f539b4 Merge remote-tracking branch 'sirikfoll/bossAhune' into 3.3.5 (PR #14884) 
(cherry picked from commit 37067ad390)
 2016-04-16 17:20:57 +01:00
Killyana
020a091901 DB/SAI: Fix phasing action for The Brothers Bronzebeard 2016-04-15 19:05:45 +02:00
Killyana
385b9d5b89 DB: Fix Typo 2016-04-15 16:43:19 +02:00
Killyana
6217cb4bf3 DB/Misc: The Prison full respawn 2016-04-14 18:57:06 +02:00
Killyana
981c22c6d8 DB/Creature: Fix some npc triggers auras 2016-04-14 13:54:56 +02:00
Killyana
c625ebe198 DB/Misc: Grim Batol Updates 2016-04-11 22:23:37 +02:00
Gigi1237
c19172cad9 Core/Blackmarket: Implemented black market 2016-04-11 18:22:09 +02:00
Killyana
45f86729f0 DB/Misc: Spawn Firelands portal and fix Captain Beld map 
Closes #16340
 2016-04-11 16:07:32 +02:00
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