aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
AgeCommit message (Collapse)Author
2014-08-24Merge branch 'PortgasDAce/1' into 4.3.4jackpoz
Close pull request #12731
2014-08-24Merge branch 'Xanvia/ShoR' into 4.3.4jackpoz
Close pull request #9071
2014-08-24Core: meh, fix build and warningsVincent-Michael
2014-08-24Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Spells/Spell.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Spells/spell_warrior.cpp
2014-08-23Core/Misc: Fix some -Wconversion warningsjackpoz
2014-08-23Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
2014-08-22Scripts/SteamVault: Hydromancer Thespia rewritten to BossAIMitchesD
2014-08-21Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4Shauren
Conflicts: src/server/authserver/Server/AuthSession.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Server/WorldSocket.cpp
2014-08-21Remove Injured rainspeaker oracle cpp scriptDr-J
Unneeded script
2014-08-21Merge pull request #12813 from MitchesD/misc_2Duarte Duarte
Scripts/ScarletMonastery: rewritten InstanceScript and some bosses conve...
2014-08-18Scripts/Ulduar: Spellscripts for MimironUnholychick
Closes #12579 Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-08-15Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4Shauren
Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/scripts/Commands/cs_reload.cpp src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-08-14Core/Creature: update creature_template and some other small thingsjoschiwald
http://www.trinitycore.org/f/topic/9572-creature-damage/
2014-08-14Scripts/Icecrown Citadel: The Teleporters in ICC are now Blizzlike *Upon ↵Jared P. Jones
entering the raid, the Lights Hammer teleporter is no longer immediately active. Both the Light's Hammer and the Oratory Portal will pop up after the completion of Lord Marrowgar as it does on official during 3.3.5a. *A teleporter in ICC can no longer teleport you to itself. *There is no longer a reason to allow GMs to use portals without available GOSSIP text and teleport locations. Therefore the teleports now use GO_FLAG_NOT_SELECTABLE when they are unavailable. In the future we can enable GMs to use portals without bosses defeated, however for now all it does is break the instance if some bosses are done out of order. *Currently the Upper Spire teleporter cannot be visited unless the event ColdFlameTraps is completed. This isn't blizz-like. During WotLK retail, the teleporter in the upper spire can be visited once any member has walked over an AreaTrigger which is located the moment you enter the UpperSpire Facade. The cold flame event has nothing to do with the teleporter, the cold flame event instead should be triggered to "DONE" when a rogue instead disarms it. *A bug has been addressed that causes the ColdFlameTraps event to not start back up after a server restart. The event will now restart as long as the player goes through the Saurfang->Upper Spire doorway; I'm not sure who required the doorway to be an area trigger, but it's hacky and not blizzlike. I have not yet addressed the area trigger problem with the doorway in this commit, mainly because the point of this commit is to make the ICC teleporters extremely Blizz-Like. *The "Conspicuous Lever" will now spawn inside of ICC. (From Sniff on Retail) While the lever currently doesn't do anything, in the future it will turn off the ColdFlame Traps. *The teleporter near Saurfang is not supposed to disable during the Intro. It disables whenever Saurfang enters combat with the players. The teleporter then enablers again when combat stops. Closes #12834
2014-08-12Remove Manaforges CPP ScriptDr-J
Remove script
2014-08-12Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4Shauren
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaScore.h src/server/game/Battlegrounds/Zones/BattlegroundAB.h src/server/game/Battlegrounds/Zones/BattlegroundAV.h src/server/game/Battlegrounds/Zones/BattlegroundEY.h src/server/game/Battlegrounds/Zones/BattlegroundIC.h src/server/game/Battlegrounds/Zones/BattlegroundSA.h src/server/game/Battlegrounds/Zones/BattlegroundWS.h src/server/game/Entities/Creature/Creature.h src/server/game/Entities/DynamicObject/DynamicObject.h src/server/game/Entities/Item/Item.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/Entities/Unit/Unit.h src/server/game/Guilds/Guild.h src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Server/WorldPacket.h src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSession.h src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/World/World.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Kalimdor/zone_ungoro_crater.cpp src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/shared/Packets/ByteBuffer.h
2014-08-10Scripts/ScarletMonastery: rewritten InstanceScript and some bosses converted ↵MitchesD
to BossAI and eventmap
2014-08-09Core/Server: Use nullptr instead of 0 where pointers are expectedDDuarte
2014-08-09Scripts/Commands: Fix static analysis issuesVincent-Michael
2014-08-09Scripts/Misc: Fix static analysis issuesjackpoz
Replace CAST_AI() macro with ENSURE_AI() when dynamic_cast is not supposed to return NULL.
2014-08-07Core: Kill AGAIN whitespace :(Vincent-Michael
2014-08-02Core/Spells: Fixed Rogue - Serrated Blades TalentPortgas
2014-08-02Core/Spells: Fix Bloodworms summon countVincent-Michael
2014-07-31Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
2014-07-31Update CMakeLists.txtDr-J
2014-07-31Delete zone_eversong_woods.cppDr-J
2014-07-31Remove Script from zone_eversong_woods.cppDr-J
This cpp is now currently redundant
2014-07-30Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/Server/WorldSocket.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-07-30Remove Script from zone_eversong_woods.cppDr-J
Remove Apprentice Mirvedas script from eversong woods cpp scripts as is not longer required.
2014-07-30Scripts/OutdoorPvP: dropped redundand codejoschiwald
2014-07-29Scripts/OutdoorPvP: replaced some chat texts with proper defense messagesjoschiwald
2014-07-29Scripts/BloodmystIsle: Fix StartUp ErrorsVincent-Michael
2014-07-29Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4Shauren
2014-07-28Update razorfen_downs.cppDr-J
2014-07-27Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4Shauren
Conflicts: README.md src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.h src/server/game/Server/WorldPacket.h src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSession.h src/server/game/Server/WorldSocket.cpp src/server/game/Server/WorldSocket.h src/server/shared/Packets/ByteBuffer.h
2014-07-27Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/authserver/Server/AuthSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Server/WorldSocket.h
2014-07-25Core/PreparedStatements: Fixed a change I missed in the World prepared ↵Subv
statements for waypoints.
2014-07-24Core: Fix buildVincent-Michael
2014-07-24Merge branch 'master' into 4.3.4DDuarte
Conflicts: src/server/game/Server/WorldSocket.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/Kalimdor/zone_darkshore.cpp src/server/scripts/Kalimdor/zone_feralas.cpp src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_generic.cpp
2014-07-24Scripts&DB/Feralas Convert npc_screecher_spirit to SAIDDuarte
SAI by @Rushor and gossip by @malcrom Closes #12630
2014-07-24Scripts/Darkshore: Fix an issue with the quest Gyromast's Revengeuntaught
TODO: Rewrite the script in SAI Closes #11987 Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24Scripts/AreaTriggers: Fix an issue with an AT for the quest The Etymidian ↵untaught
(Sholazar Waygate) Closes #12178 Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24Revert "Core/Spells: Death and Decay"Vincent-Michael
This reverts commit 02d56e00bc256f224b7d05f90af2c0af7cb287bf.
2014-07-24Scripts/Karazhan: Boss Maiden of Virtue - rewrite to events and timer ↵Ergar
adjustments Closes #12513 (PR) Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24Core/Spells: Unrelenting Assault shouldn't proc if the target isn't ↵Trisjdc
explicitly casting (turns out that UNIT_STATE_CASTING even a instant cast has a 'cast time')
2014-07-24Scripts/IoC: Rename spell_gen_* spells to spell_ioc_*DDuarte
(Additions to 6bb63ab7db679d9c) Closes #12414 (PR)
2014-07-24Script/IoC: Move some spell scripts from spell_generic to isle_of_conquest cppkarn
Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24Scripts/Four Horsemen: Horsemen's main spells should only explicitly target ↵Trisjdc
players
2014-07-24Merge branch 'master' into 4.3.4DDuarte
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/scripts/Kalimdor/zone_feralas.cpp
2014-07-24Scripts/WesternPlaguelands: Fix conditions to show gossip of Myranda the Hag ↵nelegalno
(In Dreams quest) Ref #7519 Signed-off-by: DDuarte <dnpd.dd@gmail.com>