Commit Graph
406 Commits
Author SHA1 Message Date
Nay b21fe684c1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellMgr.cpp
2013-07-30 14:14:22 +01:00
Shauren d26afd7703 Core/Spells: Fixed crashes happening with spells that had their dbc targets overriden
Closes #10395
2013-07-29 19:00:34 +02:00
Vincent-Michael 67bd19706e Core/Spells: Fix paladin talent "Daybreak" 2013-07-27 21:35:43 +02:00
Vincent-Michael 51e53b5a5e Core/Spells: Fix druid talent "Heart of the Wild" 2013-07-27 01:54:04 +02:00
Vincent-Michael 36412fbe7d Core/Spells: Fix druid talent "Stampede" 2013-07-26 22:13:11 +02:00
Vincent-Michael 5c7607955b Core/Spells: Some cleanups in SpellInfoCorrections for 4.3.4 2013-07-25 01:31:01 +02:00
Vincent-Michael d4d43d7410 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Spells/SpellMgr.h
	src/server/game/World/World.cpp
2013-07-25 00:41:37 +02:00
joschiwald c4a1ad2810 Merge pull request #10342 from joschiwald/spellinfo_corrections
Core/Spells: operate spell correction on SpellInfo store instead of dbc ...
2013-07-24 15:18:24 -07:00
joschiwald 8a87ab04ee Merge pull request #10331 from joschiwald/spell_proc_ranks
Core/Spells: allow to use ranked spells in `spell_proc_event` table (lik...
2013-07-24 15:00:14 -07:00
joschiwald e6a146aba8 Core/Spells: allow to use ranked spells in spell_proc_event table (like in spell_proc table) 2013-07-24 23:52:06 +02:00
joschiwald 9fb45ef64c Core/Spells: load spell ranks for talents from dbc 2013-07-24 15:38:19 +02:00
joschiwald 10390465f2 Core/Spells: add some logs for loading spell_script_names 2013-07-24 15:18:42 +02:00
joschiwald 00f3b01ea7 Core/Spells: operate spell correction on SpellInfo store instead of dbc (picked from 77b85b2ea0) 2013-07-24 00:06:21 +02:00
Vincent-Michael 193d71f158 Core/Spells: Fix hunter talent "Master Marksman" for 4.3.4
Closes #9968
2013-07-23 13:46:38 +02:00
Vincent-Michael 5252f1614f Core/Spells: Convert/Update death knight "Butchery" in spell script for 4.3.4 2013-07-20 01:18:53 +02:00
Vincent-Michael 557474f2ae Core/Spells: Convert/Update hunter "Rapid Recuperation" for 4.3.4 2013-07-19 21:54:21 +02:00
Shauren adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
2013-05-30 20:57:07 +02:00
Spp 9664c0ab5c Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-30 13:18:29 +02:00
Spp ec0688ade3 Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
2013-05-21 11:27:12 +02:00
Spp 86afccc8ff Merge branch 'master' into 4.3.4 (Only the Logging System One)
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Tools/PlayerDump.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
2013-05-21 09:55:09 +02:00
Spp 1b6fb2b695 Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Movement/Spline/MovementTypedefs.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
	src/server/scripts/Spells/spell_generic.cpp
2013-05-21 09:41:13 +02:00
horn 0a0698b1d4 Scripts/Ulduar: Yogg-Saron
Known issues:
- encounter doesn't start immediately after you enter the room, you need to go closer
- players standing outside of the room are not turned Insane after 15 seconds
- encounter resets if the last living player is gripped by Constrictor Tentacle or encased in Hodir's Flash Freeze
- Hodir won't freeze multiple players when they die at the same moment
- Flash Freeze missile (64176) won't hit anybody, probably cast too soon (cosmetic issue)
- there are some unused spells, don't know when or why they should be cast
- some spell animations hit multiple players, but they shouldn't do that
2013-05-14 17:52:37 +02:00
Spp d1677b2db0 Core/Logging: Performance-related tweaks to logging system
All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
    Memleak fix
2013-05-13 15:07:36 +02:00
Vlad 78195b3c54 Allow use effectIndex in spell_target_position. 2013-05-13 11:30:48 +03:00
Shauren 64f0e99958 Core/StatSystem: Implemented mastery. 2013-05-12 17:56:37 +02:00
Shauren e2f8abd48d Core/Spells
* Removed area MiscValue check for spells with SPELL_EFFECT_BIND, it's purpose is only to be sent in packets, not determine real area player will be bound to.
* Corrected guid sent in SMSG_PLAYERBOUND, it should be caster's guid, not player's
* Also updated position for Teach: Death Gate

Closes #9661
2013-05-11 12:16:36 +02:00
Nay 26efbacfab Core/Spells: Fix a logging message error 2013-05-02 03:56:34 +02:00
Vincent_Michael a9b740ab74 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/shared/Packets/ByteBuffer.h
2013-03-10 01:08:55 +01:00
Nefarion 49fd11ab5a First step of comment style refactoring to doxygen-style. 2013-03-08 21:55:37 +01:00
Vincent_Michael c376757241 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-03 21:17:41 +01:00
Trista a108a9026a Scripts/Eye of Eternity: Rewrite Arcane Barrage mechanic
* Note that even after last changes happens I'm not sure exactly how the timers are controlled. The wipe chance should be a lot smaller now.. Any further change I can think of is beyond what I see. The main problem is currently. In theory there is chance, If timers get to be same with delay lesser than 2 seconds and if target randomisations select same target for shit out of luck reason. And if starting different timers were matching you can be hit atleast 2-3 times and on 25 mode maybe more. The timers are not with fixed difference for sure is all I know.
2013-03-03 03:16:17 +02:00
Vincent_Michael 5fd8add7bf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-03-01 21:45:00 +01:00
Trista d1853f693b Scripts/Eye of Eternity: Remove some flags, fix some timers and some misc
* Starting timers were a bit slower
* Destroy platform proper timing for drake casting mount spell to player (trigger)
* Remove IMMUNITY_PC flag after Iris is triggered (thx to Expecto) and readd it on evade
* Remove NOT_SELECTABLE flag since shouldn't be present at starting event
* Fix misc of id of Static Field added to LOS attributes
2013-03-01 16:25:58 +02:00
Vincent_Michael b2d05c9cdd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
2013-02-28 22:14:48 +01:00
Trista 6801314881 Scripts/Eye of Eternity: Rewrite most of it.
Closes: #1133,  #8212, #1150, #5003, #6794

* More stuff will be done, a lot to clean maybe, as of raiding it's good to go now pretty much*.
* Big thx to Shauren, Horn, manuel, Machiavelli, Nay, Krofna and rest who helped.
2013-02-28 18:44:07 +02:00
Vincent_Michael cd24526aac Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-26 16:11:15 +01:00
QAston 6403e3fbfe Core/SpellsMgr: remove unneeded functions from spellmgr, add some const modifiers for methods 2013-02-26 11:05:10 +01:00
Vincent_Michael 71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
2013-02-18 18:51:52 +01:00
Shauren e49aaab6f6 Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line 2013-02-17 02:10:08 +01:00
Vincent_Michael 49e196e6b0 Misc/Spells:
- Add some ulduar teleport pos for spells
- Add target hack for ulduar teleport spells
2013-02-16 03:26:26 +01:00
Vincent_Michael 6161f69b7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/SpellMgr.cpp
2013-02-02 00:16:11 +01:00
Shauren 817f5b3648 Scripts/Icecrown Citadel:
* Fixed Coldflame dealing double damage
* Targets hit by Bone Slice will now be immune to Bone Spike Graveyard
* Fixed healing players on Bone Spike

Closes #1091
Closes #4473
Closes #5854
Closes #7060
2013-02-01 18:06:51 +01:00
Tuxity 5b7c01e48c Core/Spells: Add missing break in previous commit 2013-01-22 17:43:18 +01:00
Tuxity c72afa9ecf Core/Spells: Fix Tree of Life (Passive). Closes #8544
I learn something today, thx Shauren
2013-01-22 15:44:47 +01:00
Spp 0e8011657d Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
Malcrom ace7bbeddf Core/Zul'Grub: Fix up Mandokir Boss 2013-01-16 00:41:03 -03:30
Subv bb1c955c8b Scripts/HallsOfOrigination: Added script for Anraphet and the Vault of Lights.
Some bugs might still remain.
Crumbling Ruin spell has a problem with radius handling.
2013-01-04 18:07:56 -05:00
Vincent_Michael eba9abd2ee Core/Spells: Update no fly zone for wintergrasp 2013-01-03 17:37:39 +01:00
Vincent_Michael aa43ecd18d Core/Spells: Removed no fly zone for dalaran 2013-01-03 16:58:38 +01:00
Spp aed36a8375 Merge branch 'master' into 4.3.4
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ReferAFriendHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
2013-01-02 13:30:51 +01:00