aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
AgeCommit message (Collapse)Author
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>
2014-07-24Scripts/Feralas: Make Screecher Spirit disappear after clicking on themRushor
This is a temporary solution, the script should be rewritten in SAI Closes #12298 Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-24Scripts/ICC: Summon Sealed Chest quest npc's upon the Lich King's DeathFoldy
TODO: template updates for these npcs and gossips Closes #10554 Closes #12591 (PR) Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-23Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2014-07-22Core/Misc: Replace rand() calls with SFMTjackpoz
2014-07-22Core: Fix compile and a warning in spell_paladinDDuarte
2014-07-22Merge branch 'master' into 4.3.4DDuarte
Conflicts: src/server/authserver/Realms/RealmList.cpp src/server/scripts/EasternKingdoms/zone_ironforge.cpp
2014-07-21Scripts/ICC: Fix non-pch buildDuarte Duarte
2014-07-21Scripts/ICC: Added Orange/Green Blight ResidueGolrag
Closes #5920 Closes #12464 (PR) Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-20Scripts/EasternKingdoms: Burn with fire (hihi)Vincent-Michael
2014-07-20Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp src/server/scripts/Northrend/zone_dalaran.cpp src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
2014-07-20Core: Fix non pch build (gcc)Vincent-Michael
2014-07-19Core/Creature: Minigob Manabonkkarn
Closes #11097 Signed-off-by: DDuarte <dnpd.dd@gmail.com>
2014-07-19Merge pull request #12500 from MitchesD/misc_3Duarte Duarte
Scripts/MagistersTerrace: reworked Selin Fireheart
2014-07-19Scripts/MagistersTerrace: reworked Selin FireheartMitchesD
* removed ancient code * converted to EventMap * removed illogical method in instance script
2014-07-19Merge pull request #12166 from MitchesD/horjoschiwald
Scripts/HoR: fixed possible exploit with taunt during escape event
2014-07-19Scripts/HoR: fixed possible exploit with taunt during escape eventMitchesD
2014-07-19Scripts/AhnKahet: Elder Nadoxjoschiwald
* replaced egg core script with db content * removed useless spellscript for Guardian Aura * fixed Swarm aura * Patch 3.3.2 (2010-01-02): Elder Nadox now only gets one Ahn'Kahar Guardian during the encounter. Closes #12506
2014-07-19Part 3: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore ↵Shauren
into 4.3.4
2014-07-19Part 2: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore ↵Shauren
into 4.3.4
2014-07-19Merge remote-tracking branch 'origin/master' into 4.3.4Shauren
Conflicts: src/server/authserver/Main.cpp src/server/authserver/Realms/RealmList.cpp src/server/authserver/Realms/RealmList.h src/server/authserver/Server/AuthSession.cpp src/server/authserver/Server/AuthSocket.h src/server/authserver/Server/RealmAcceptor.h src/server/game/Accounts/AccountMgr.h src/server/game/Achievements/AchievementMgr.cpp src/server/game/Achievements/AchievementMgr.h src/server/game/Battlegrounds/ArenaTeamMgr.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/DungeonFinding/LFGMgr.h src/server/game/Entities/Object/Object.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Movement/Spline/MoveSplineFlag.h src/server/game/Quests/QuestDef.cpp src/server/game/Quests/QuestDef.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/game/Spells/Spell.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/Spells/spell_mage.cpp src/server/scripts/Spells/spell_rogue.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warrior.cpp src/server/shared/Cryptography/BigNumber.h src/server/worldserver/RemoteAccess/RASocket.cpp src/server/worldserver/worldserver.conf.dist
2014-07-19Core/Spells: Fix Quest "The Emissary"Vincent-Michael
2014-07-17Buildsystem/MSVC: Warning fixesShauren
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning) C4127 conditional expression is constant
2014-07-16Merge branch 'master' of github.com:TrinityCore/TrinityCore into boostleak
2014-07-14Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaScore.h src/server/game/Battlegrounds/Battleground.cpp src/server/game/Battlegrounds/Battleground.h src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Pet/Pet.cpp src/server/scripts/Commands/cs_wp.cpp
2014-07-14Scripts/Commands: Fix warnings vs2014 ctp (no support)Vincent-Michael
2014-07-13Merge branch `master` into `boost`Subv
Conflicts: BattlegroundMgr.h
2014-07-12Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Handlers/SkillHandler.cpp
2014-07-12Core/Misc: Renamed a few spell and skill line related methods to follow tc ↵Shauren
coding standards
2014-07-12Core/Skills: Fixed spells automatically learned from skill lines adding more ↵Shauren
skill lines
2014-07-12Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
2014-07-12Core/Commands: Fixed crashes caused by using .account lock ip and .account ↵Shauren
lock country commands from console - these commands apply to currently logged account so they cannot be used from console
2014-07-12Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/DungeonFinding/LFGMgr.cpp src/server/scripts/Spells/spell_paladin.cpp
2014-07-11Core: Fix warnings with other wayVincent-Michael
2014-07-11Scripts/Misc: Fix some warnings vs2014 ctp (no support)Vincent-Michael