aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-07Merge pull request #15731 from ShinDarth/toscriblub
Convert the Duel Cooldown Reset feature to scripts (cherry picked from commit 5c449b50aadcb35a4bd7fdc25d3a249f023cf507)
2015-11-07Merge pull request #15727 from ShinDarth/duel-cdMitchesD
Core/SpellHistory: Improved Cooldown Duel Reset (cherry picked from commit 981e764004cc8b09c8f29205d9675bfd6e02ae7b) Conflicts: src/server/game/Spells/SpellHistory.cpp
2015-11-07Merge pull request #15697 from ShinDarth/cdMitchesD
Core/Player rewritten duel CD reset system (cherry picked from commit 4204805d47078abf54e8a1c50321e63193a7c68d) Conflicts: src/server/game/Spells/SpellHistory.cpp src/server/game/Spells/SpellHistory.h src/server/game/World/World.h
2015-11-07Merge pull request #15646 from ShinDarth/ticketShauren
Core/Player: implement ResetCoolDownAfterDuel configurable feature (cherry picked from commit 5b8f1469ca32ff1b02b8f902954e1ffc362c4343) Conflicts: src/server/game/Spells/SpellHistory.cpp src/server/game/Spells/SpellHistory.h src/server/game/World/World.h
2015-11-06Merge pull request #15711 from ShinDarth/bg-leaveNaios
Core/BG: Improved Battleground.InvitationType = 2 (cherry picked from commit 5a71eb73848b39af19b266f0a063798c7c85b7e2)
2015-11-06Merge pull request #15676 from ShinDarth/bg2Naios
Core/Battlegrounds: implement even BG teams configuration (cherry picked from commit f179c4180fec834c2d588f27994452649bdbe87c)
2015-11-06Merge pull request #15707 from ShinDarth/pvpstatspete318
Core/BG fix .character changefaction pvpstats victories amount (cherry picked from commit 69941864efa9e40a787f53f055c79336378b8d4d) Conflicts: sql/base/characters_database.sql src/server/game/Battlegrounds/Battleground.cpp
2015-11-06Core/Corpses: Fixed a possible crash adding bones to gridShauren
Closes #15808
2015-11-06Scripts/Commands: Add taxinodes cheat status toduhow
* Some cleanup Closes #15065 (cherry picked from commit 558ce7d877d5a192a98065a5a9eea694b48477b7) Conflicts: src/server/scripts/Commands/cs_cheat.cpp
2015-11-06DB/Quest: The Echo of YmironKillyana
2015-11-06DB/Creature: Add missing spawn for Commander HobbKillyana
2015-11-06DB/Creature: Reguid one spawnKillyana
2015-11-06DB/gossip: Add missing gossips to Garrosh HellscreamKillyana
(cherry picked from commit 3b544a35777005e606bcfad7cbaab7dfa85f0ba1)
2015-11-06Scripts/ICC: moved saurfang gossips to dbKillyana
Closes #14904 (cherry picked from commit 7225b7abf10cd637c22eae5ef1b473dfbfbe9148)
2015-11-06Core/Scripts: Salanar the Horseman, Into the Realm of ShadowsCreshandKesh
- 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 359df54b79fcfa9d95ddd9d2d891f6e26697e476)
2015-11-06DB/Conditions: corrected loot conditions after ↵joschiwald
8a9f1b871ac7a3c165d00f1404eaf3d91e3c5060 (cherry picked from commit df92d2c8d259a272bf5abfc41293f88781d03457)
2015-11-06DB/Misc: Fix startup errorsAokromes
Updates #14730 (cherry picked from commit b9b3955e3206db28c8f71871745bc53bef1b859d)
2015-11-06Core/Misc: Remove unneeded filesIncorrect
These 3 BlackRock Mountain scripts can be removed from source: - boss_anubshiah.cpp - boss_gorosh_the_dervish.cpp - boss_grizzle.cpp They already removed from the creatures in DB, and are currently causing DBErrors. (cherry picked from commit d98037a75dd8a3edc2d95051b68fb4db83fb9d7b)
2015-11-06Core/Players: Fixed saving players with incorrect genderShauren
(cherry picked from commit 6c53f820ae0349a556085f54caa9dff86bba4d1b)
2015-11-06Core/Player: Set correct Gender by ModelidKittnz
An example: You are a blood elf female, you use [Iron Boot Flask], you turn into a male dwarf, you use [Orb of the Sin'dorei] and it will turn you into a blood elf male. This is the correct behavior like retail. (cherry picked from commit 3c82b498cc694d9ed04e29079a4c61d68dc7741e) (cherry picked from commit 16f9d4ceebe9c4688214df2643fd74c1932e901d)
2015-11-06Core/Player: Fix not being able to do seasonal quests(if already done in the ↵MitchesD
past) (cherry picked from commit 1ef1d42d145c18579a7e7ca15cebb38485bc0cff) (cherry picked from commit 56b27711a4db7b56c5e6246426c89cd99e8c8cd4)
2015-11-06Scripts/Commands: enhanced .instance get/setbossstate commandsShinDarth
(cherry picked from commit 1ffec02d760fe88deb4ccce0d13bce344a20bd15) # Conflicts: # src/server/game/Instances/InstanceScript.cpp # src/server/scripts/Commands/cs_instance.cpp
2015-11-06Core/Battleground: Fix "Call to Arms: Isle of Conquest!" not giving Holiday ↵jackpoz
Weekend honor (cherry picked from commit 562e82928f3a57c60bcace69ca73246afc0f1805)
2015-11-06Scripts/BWL: cleanup instancescriptjoschiwald
(cherry picked from commit 05429b35937b02ef1f191a39d2654a68ab5c4241) # Conflicts: # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
2015-11-06Core/Scripts: fix build after recent cherry picksMitchesD
2015-11-06DB/SAI: Fix a DB errorKillyana
Origin: https://github.com/TrinityCore/TrinityCore/commit/91de0322bba3ef071338ce5a71f512369486eb1f (cherry picked from commit 7bfbd9e3d84907048728beec3800c6f1c80aa271)
2015-11-06DB/Creature: Remove wrong spawns and add triggers npcs for future events on ↵Killyana
Icecrown Airships (cherry picked from commit e4520ec78bb7218840831e13203e13e4c15abc7d)
2015-11-06DB/CORE Minor change in quest Kick, What Kick? and some codestylesirikfoll
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 22f1d269865a5980dabadab1f469e60a701e9de1)
2015-11-06DB/Instance: The Eye instance updatesKittnz
- Pathing for Phoenix-Hawk, Crystalcore Devastator, Astromancer Lord, Nether Scryer - Delete & Correcting some npc's locations, formations.. (cherry picked from commit 700b5dcb491a4356df23c5013edc47e2a5194d1e)
2015-11-06Scripts/Naxxramas: Anub'rekhan encounter cleanup.treeston
- 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 91de0322bba3ef071338ce5a71f512369486eb1f) # Conflicts: # src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
2015-11-06DB/Event: Day of the Dead spawn addon fixesKittnz
Spirit's & Celebrant's should be invisible, only visible with [Orange Marigold] and [Bouquet of Orange Marigolds] (cherry picked from commit eddc759cbe49d8a1170660ca825eb4af8b02caa3)
2015-11-06Scripts/Naxxramas: Faerlina cleanup:treeston
- 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 577fcf356e9cd54fb0490069d7aa26894e9b5db3) # Conflicts: # src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
2015-11-06Scripts/Naxxramax: Fix clang warningjackpoz
(cherry picked from commit da0671f4fee1ee00a45dc15e4ddd94d3f9c82a18)
2015-11-06DB/Misc: Commoners (Hallow's End)Dr-J
Adds more texts and gossip for Hallows End (cherry picked from commit 20ee754de9185a524ff9a9c9adeb7d3f32ad148e)
2015-11-06DB/Creature: Fix movement type for Thomas YanceKillyana
(cherry picked from commit c911a2aaa90410bbe17d2cd5c618f9211fd65bf7)
2015-11-06DB/Conditions: Dead Mage HunterDr-J
Dead Mage Hunters should not be interactable without the quest 'rifle the bodies' (cherry picked from commit fc95812141e925b727235530fbea94663eb43f97)
2015-11-06DB/Text: Real texts and sounds ids for Headless HorsemanDr-J
(cherry picked from commit f7e6f7a1054a1fbd44491dd347d46d7389d8b704)
2015-11-06DB/Misc: Fallen Hero's SpiritDr-J
Script http://www.wowhead.com/npc=32149/fallen-heros-spirit#comments (cherry picked from commit cb48f454fa9b01e7a0ca0175ed7b948f69ca5ba4)
2015-11-06DB/Pathing: Azuremyst Isle UpdatesRushor
* by @Grz3s (cherry picked from commit 641f34c78a41e3ebe1428c431dbbd2808a543cf9)
2015-11-06DB/Creature: Cenarion Circle ReputationRushor
closes #15759 (cherry picked from commit eae956c88da0f49e0c1d777f8785670b6bd52aeb)
2015-11-06DB/Creature: Zul'Farrak - Disable Movement for Trolls after DeathRushor
* else the corescript moves the dead creatures (cherry picked from commit 1c519a74e2f620ac8a35a1b49c1a8010d9f76fca)
2015-11-06Scripts/IcecrownCitadel: Quest 'Blood Quickening' - Add Killcredit in 25ManRaidRushor
closes #15733 (cherry picked from commit c5641a9a58e385015dbbcefd9dd747ee52f21f97)
2015-11-06DB/Path: Pathing for few rats in DalaranKittnz
(cherry picked from commit 6264f25a982f5fd36b549d6a53b9d572b6f4f0e5)
2015-11-06DB/Gossip: Orbaz Bloodbane - Gossip optionRushor
by @tkrokli + @Pitcrawler , closes #15737 (cherry picked from commit db8aba662ae94aeaab74ae2ae29c38cf0b8bffb4)
2015-11-06DB/Creature: Grethok the Controller - Add text on DeathRushor
(cherry picked from commit 82b727360c310fcc07439cbe2ad057941c914c43)
2015-11-06DB/Pathing: Onyxia's LairRushor
(cherry picked from commit 6a0ceb96fdb9b911f1a561d1bde23e4d06d68f36)
2015-11-06DB/Creature: Thistle Boar - Skinning LootRushor
* closes #15744 (cherry picked from commit 54341dc8ab77d48c0c0c245648e6fd51bed3e0eb)
2015-11-06DB/Creature: Small Crag Boar - Remove invalid skinning LootRushor
* closes #15742 (cherry picked from commit 85616fcec3afde5fb6d456341d1b192b5d44d5bd)
2015-11-06DB/Creature: Young Thistle Boar - Skinning LootRushor
* closes #15743 (cherry picked from commit 1bce1b99b9c64d5be59f51dfcf2b3b4dfbff7ac6)
2015-11-06DB/Creature: Gryphoneer Leafbeard - GossipRushor
* closes #15745 (cherry picked from commit be0649fafbc2e700b1f6043a1c33f44796ce7e7d)