Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,821 Commits 4 Branches 146 Tags
b86972f9779830ed65ca2e86eae4956da40e3c22
Commit Graph

8764 Commits

Author SHA1 Message Date
Killyana
b86972f977 DB/Creature: Fix some wrong quest givers 
Closes #12752
Closes #15893
 2015-11-24 15:45:20 +01:00
Shauren
d5fb18d3c3 Core/Spells: Implemented scaling spell value with item level 2015-11-24 00:16:42 +01:00
Killyana
7430daab1f DB/Quest: Hot and Cold 
Updates #15566
 2015-11-23 20:15:07 +01:00
Killyana
4315f13380 DB/Condition: Lothos Riftwaker Molten Core teleport 
By @Malcrom
Closes #15701
 2015-11-23 20:08:18 +01:00
Killyana
ea2a331385 DB/Misc: Spawns for highbank and Twilight Highlands 
By @Malcrom
 2015-11-23 18:22:12 +01:00
Killyana
c458b10153 DB: End line 2015-11-23 18:09:33 +01:00
Killyana
d6db870974 DB: Add some missing cherry picks 
194fda8a4e
182d4e913c
a85bc8aa39
ec0df1120a
 2015-11-23 18:05:30 +01:00
Shauren
035a2b122e Core: Updated to 6.2.3.20726 2015-11-21 21:30:05 +01:00
MitchesD
8dfc753770 Scripts/Commands: updated .npc info to show correct PhaseIDs and PhaseGroups 2015-11-20 20:28:21 +01:00
blub
2a9a68877a Merge pull request #15729 from Vincent-Michael/gpsTransport 
Core/Commands: Added transport position for command .gps
 2015-11-14 20:41:50 +01:00
Vincent-Michael
9c99a1d0c7 Core/Commands: Added transport position for command .gps 2015-11-14 20:12:50 +01:00
Killyana
e2e8a0d1bc DB/SAI: Add missing text for Lore Keeper of Norgannon 2015-11-10 16:27:52 +01:00
Shauren
dfc8ea0ad5 Core/Commands: Improved additem and additemset commands. Added optional parameter allowing to specify bonuslist ids for items (you can copy the ids from wowhead urls) 2015-11-09 17:57:37 +01:00
Killyana
26e7d01af6 DB/Quest: Aberrations 2015-11-09 14:52:20 +01:00
Killyana
e1d442cf7d DB/Misc: Add missing gossip option text for Brassbolt Mechawrench and Reginald Arcfire 
Replace vendor of the brewfest condition by achievement instead of quest
 2015-11-09 14:49:15 +01:00
MitchesD
49d487b9c8 DB/SAI: fix phase related start up errors 2015-11-08 10:56:56 +01:00
Carbenium
271390753d TDB 6.03 - 2015/11/08 2015-11-08 02:20:45 +01:00
Carbenium
3dde44cf64 DB: Add missing change to char base after 39d29edf93 2015-11-08 00:39:33 +01:00
MitchesD
0031a6e134 Merge pull request #14664 from tkrokli/Exorcism_of_Colonel_Jules 
[Core/DB] Quest: The Exorcism of Colonel Jules
(cherry picked from commit 5db0202a0a)
 2015-11-07 13:32:24 +01:00
Carbenium
752474e2ae Rename SQL files 2015-11-07 03:45:00 +01:00
Killyana
ff2db2758e DB/Creature: Ahn'Qiraj 434 & 6X Spawns 
Closes #15784
 2015-11-07 02:11:59 +01:00
Killyana
e9d910a87b DB/Creature: Apexis Flayer 2015-11-07 01:52:44 +01:00
Killyana
c9b7101d7f DB/Page text: Saga of the Sin'dorei 2015-11-07 01:27:11 +01:00
Shauren
88584a7398 Merge pull request #15495 from Treeston/3.3.5-gemperfection 
Core/Spell: Implement "Gem Perfection" (and framework for similar spells in the future)
(cherry picked from commit 15cafba8d5)
 2015-11-07 01:15:21 +01:00
MitchesD
63f253e95c Merge pull request #15697 from ShinDarth/cd 
Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
 2015-11-07 00:35:24 +01:00
Shauren
8ceffaef44 Merge pull request #15646 from ShinDarth/ticket 
Core/Player: implement ResetCoolDownAfterDuel configurable feature
(cherry picked from commit 5b8f1469ca)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
 2015-11-07 00:15:00 +01:00
pete318
39d29edf93 Merge pull request #15707 from ShinDarth/pvpstats 
Core/BG fix .character changefaction pvpstats victories amount
(cherry picked from commit 69941864ef)

Conflicts:
	sql/base/characters_database.sql
	src/server/game/Battlegrounds/Battleground.cpp
 2015-11-06 23:46:03 +01:00
duhow
28bdb50d80 Scripts/Commands: Add taxinodes cheat status to 
* Some cleanup

Closes #15065

(cherry picked from commit 558ce7d877)

Conflicts:
	src/server/scripts/Commands/cs_cheat.cpp
 2015-11-06 20:17:38 +01:00
Killyana
c8b91dd511 DB/Quest: The Echo of Ymiron 2015-11-06 19:26:41 +01:00
Killyana
07792c4957 DB/Creature: Add missing spawn for Commander Hobb 2015-11-06 18:51:13 +01:00
Killyana
34d7d7b027 DB/Creature: Reguid one spawn 2015-11-06 18:32:01 +01:00
Killyana
8d73d432c3 DB/gossip: Add missing gossips to Garrosh Hellscream 
(cherry picked from commit 3b544a3577)
 2015-11-06 13:20:11 +01:00
Killyana
286f0ea6f3 Scripts/ICC: moved saurfang gossips to db 
Closes #14904

(cherry picked from commit 7225b7abf1)
 2015-11-06 13:17:54 +01:00
CreshandKesh
143d00a242 Core/Scripts: Salanar the Horseman, Into the Realm of Shadows 
- Show gossip_menu_option 9739 only if quest 12687 is accepted & not completed
- Cast spell 52693, SPELL_REALM_OF_SHADOWS, when gossip option is selected

Core script by @CreshandKesh (with some modifications)
SQL part by @CreshandKesh and @tkrokli, condition adjustment by @Killyana.

Closes #15603
Closes #15657

(cherry picked from commit 359df54b79)
 2015-11-06 13:14:05 +01:00
joschiwald
07f2b40443 DB/Conditions: corrected loot conditions after 8a9f1b871a 
(cherry picked from commit df92d2c8d2)
 2015-11-06 13:07:12 +01:00
Aokromes
ec9fa4bd74 DB/Misc: Fix startup errors 
Updates #14730
(cherry picked from commit b9b3955e32)
 2015-11-06 13:03:48 +01:00
ShinDarth
040b098aef Scripts/Commands: enhanced .instance get/setbossstate commands 
(cherry picked from commit 1ffec02d76)

# Conflicts:
#	src/server/game/Instances/InstanceScript.cpp
#	src/server/scripts/Commands/cs_instance.cpp
 2015-11-06 11:56:13 +01:00
jackpoz
ceed5e2d35 Core/Battleground: Fix "Call to Arms: Isle of Conquest!" not giving Holiday Weekend honor 
(cherry picked from commit 562e82928f)
 2015-11-06 11:51:28 +01:00
Killyana
bd91acf84c DB/SAI: Fix a DB error 
Origin: 91de0322bb
(cherry picked from commit 7bfbd9e3d8)
 2015-11-06 11:14:08 +01:00
Killyana
cfa7cdf6aa DB/Creature: Remove wrong spawns and add triggers npcs for future events on Icecrown Airships 
(cherry picked from commit e4520ec78b)
 2015-11-06 11:13:01 +01:00
sirikfoll
d4b3b1d1d2 DB/CORE Minor change in quest Kick, What Kick? and some codestyle 
Remove the line that despawns the 'Apple' npc, this despawn is non-blizzlike and breaks the quest.
Thx Killyana for sql and valuable information

Closes #15480

(cherry picked from commit 22f1d26986)
 2015-11-06 11:11:16 +01:00
Kittnz
33baefc49e DB/Instance: The Eye instance updates 
- Pathing for Phoenix-Hawk, Crystalcore Devastator, Astromancer Lord, Nether Scryer
- Delete & Correcting some npc's locations, formations..

(cherry picked from commit 700b5dcb49)
 2015-11-06 11:10:00 +01:00
treeston
6d14c4871f Scripts/Naxxramas: Anub'rekhan encounter cleanup. 
- Cleaned up events behavior to use phases instead of weird checks for auras.
- Cleaned up Crypt Guard despawn behavior, they should no longer despawn instantly upon death.
- Moved initial greeting from MoveInLineOfSight hack to proper areatrigger script.
- Fixed Crypt Guard respawn behaviour to prevent pulling them before Anub'rekhan has fully reset.
- Fixed Crypt Guard aggro behaviour to call for help on aggro. This prevents pulling the initial pair of Crypt Guards without engaging the boss.
- Added missing boss emotes.
- Code style cleanup.

(cherry picked from commit 91de0322bb)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
 2015-11-06 11:07:31 +01:00
Kittnz
d94e5d17e7 DB/Event: Day of the Dead spawn addon fixes 
Spirit's & Celebrant's should be invisible, only visible with  [Orange Marigold] and  [Bouquet of Orange Marigolds]

(cherry picked from commit eddc759cbe)
 2015-11-06 11:03:26 +01:00
treeston
b6ac8c577c Scripts/Naxxramas: Faerlina cleanup: 
- Move greeting to areatrigger instead of MoveInLineOfSight hack
- Clean up add spawn handling to prevent various glitching with combinations of evade state and add aggro
- Ensure all adds are always pulled alongside the boss and vice versa
- Add missing texts.
- Fix a bug in the core that prevents castable-while-dead spells (such as Widow's Embrace) from appearing on possess bars.

(cherry picked from commit 577fcf356e)

# Conflicts:
#	src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
 2015-11-06 10:59:34 +01:00
Dr-J
abb714a36e DB/Misc: Commoners (Hallow's End) 
Adds more texts and gossip for Hallows End
(cherry picked from commit 20ee754de9)
 2015-11-06 10:55:21 +01:00
Killyana
07dce1158f DB/Creature: Fix movement type for Thomas Yance 
(cherry picked from commit c911a2aaa9)
 2015-11-06 10:53:43 +01:00
Dr-J
d6e912a881 DB/Conditions: Dead Mage Hunter 
Dead Mage Hunters should not be interactable without the quest 'rifle the bodies'
(cherry picked from commit fc95812141)
 2015-11-06 10:53:03 +01:00
Dr-J
93b8c0261f DB/Text: Real texts and sounds ids for Headless Horseman 
(cherry picked from commit f7e6f7a105)
 2015-11-06 10:51:47 +01:00
Dr-J
f3f0968dbf DB/Misc: Fallen Hero's Spirit 
Script http://www.wowhead.com/npc=32149/fallen-heros-spirit#comments
(cherry picked from commit cb48f454fa)
 2015-11-06 10:50:05 +01:00