Commit Graph
4080 Commits
Author SHA1 Message Date
Malcrom cc6e4d4608 Sripting/Blackrock Caverns: Start scripting for Blackrock Caverns 2014-09-21 19:05:59 -02:30
Vincent-Michael 5061def422 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
2014-09-21 12:11:03 +02:00
Vincent-Michael f767aef12e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Globals/ObjectMgr.cpp
2014-09-20 22:39:37 +02:00
jackpoz a209fc30ff Core/Misc: Avoid Helgrind reporting libstdc++ false positive race conditions 2014-09-20 22:35:13 +02:00
jackpoz b5e3535dbf Core/Misc: Refactor scripts to fix static analysis warnings
Sixth batch of fixes targeting 100 issues reported by Coverity
2014-09-20 20:21:54 +02:00
joschiwald 54c195bee8 Core/Spells: fixed Intervade
Closes #13171
2014-09-20 19:15:37 +02:00
Shauren 8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.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/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.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.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.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/LFGHandler.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/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
2014-09-20 11:05:30 +02:00
Nyeriah 2c2d3a8ffc Scripts/Auchindoun: Darkweaver Syth
- Despawn minions on death/reset
- Misc clean up
2014-09-20 02:58:08 -03:00
xjose93 0d50833d20 Core/Commands: Fix displaying in .baninfo character command. 2014-09-19 18:58:12 +02:00
Shocker 80f77977f1 Core/Grids: Replace some magic numbers with constants
(P.S.: That's why! @cs_misc.cpp)
2014-09-19 18:03:49 +03:00
Malcrom a32d15c4ef Scripting/Tanaris: added a few enums 2014-09-19 01:40:15 -02:30
DDuarte cefcde9ba9 Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code) 2014-09-19 03:30:02 +01:00
joschiwald 0f1f7ef401 Core/Misc: multiple changes
* fixed build
* apply tc codestyle to ObjectGuid class
* fixed warning
2014-09-19 03:16:59 +02:00
joschiwald e567ab9597 Core/Texts: added TextRange parameter to creature_text
Ranges:
0 - Normal (Default)
1 - Area
2 - Zone
3 - Map
4 - World

Ref #13116
2014-09-18 23:33:59 +02:00
joschiwald 60176157a7 Scripts/Gundrak: cleanup InstanceScript
* converted Gal'Darah and Moorabi to BossAI
* add and correct some texts
* fixed altar activation spell visual
2014-09-18 00:38:28 +02:00
joschiwald b08dcb1d99 Core/Scripts: implemented a guid map in InstanceScript, this way you can easier store guids and access its objects 2014-09-18 00:25:05 +02:00
Unholychick 6477e96cca Core/Spells: Fix some -Wconversion warnings
Attempt to fix #13152 by properly casting between data types during damage calculations.
2014-09-16 23:56:05 +02:00
Nyeriah 2a262aad21 Scripts/Quest: Script spell for quest "Fumping"
Updates https://github.com/TrinityCore/TrinityCore/issues/11418
2014-09-16 17:49:16 -03:00
Shauren 7d1d55124c Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Scripting/MapScripts.cpp
	src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
	src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
	src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
2014-09-16 21:50:01 +02:00
Vincent-Michael 7cbaa028cd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-16 21:09:19 +02:00
Shauren 878073d516 Core/Logging: Fixed incorrect usage of guid in logs 2014-09-16 20:47:08 +02:00
Shauren bee9a3069b Core/Scripts: Fixed incorrect guid usage in logs 2014-09-16 19:56:33 +02:00
Shauren 6c1a33d62d Core/Scripts: Fixed incorrect guid usage in logs 2014-09-16 19:47:10 +02:00
Shauren 9b316fe689 Core/Scripts: Fixed PCH build 2014-09-16 00:44:56 +02:00
Shauren 5ac62d9ca3 Core/Scripts: Fixed build zone_* scripts 2014-09-15 23:57:03 +02:00
Shauren 48deb443f9 Core/Scripts: Fixed build of misc scripts, only zone_* and instance_* remain 2014-09-15 22:52:09 +02:00
Shauren a3d8f1d879 Core/Scripts: Fixed build of boss_* scripts 2014-09-15 22:07:11 +02:00
Shauren 6ce0a3107d Core/Scripts: Changed GetGUID/SetGUID script hooks to operate on ObjectGuid class
Fixed compile for boss scripts starting with letters B, C and D
2014-09-15 00:23:47 +02:00
Nyeriah e4d875a249 Scripts/ToCR: Set Anub'arak's respawn delay
* This needs to be done manually since he's a summon.
Closes https://github.com/TrinityCore/TrinityCore/issues/10587
2014-09-14 18:40:45 -03:00
Shauren 56f46e3ce5 Scripts
* Introduced GetGuidData/SetGuidData to store guids in instance scripts (GetData64/SetData64 are still there)
* CONDITION_INSTANCE_INFO: Changed existing DATA64 condition to GUID_DATA to preserve current use of this instance info type (most/all assume the data is a guid) and moved DATA64 to a different value - no db changes needed
* Fixed compile in boss scripts starting with letter A
2014-09-14 23:23:23 +02:00
Vincent-Michael b0270d547f Core: Remove whitespace 2014-09-14 21:42:39 +02:00
jackpoz 7d26a2ccd4 Scripts/Commands: Fix ".npc info" immune mask output
Fix ".npc info" showing wrong immune mask list
Fixes #12358
2014-09-14 20:58:17 +02:00
Malcrom f471c49563 Scripting/Felwood: Scripted Whisperwind Lasher for quest Weeding the Lawn 2014-09-14 15:07:18 -02:30
Nyeriah 92d514d0c9 Scripts/Misc: Some code style fixes for old code 2014-09-14 12:55:48 -03:00
Nyeriah 66c90122ec Scripts/OnyxiaLair:
- Potential null pointer crash fix
- Reset react state properly on wipes during air phase
2014-09-14 12:16:07 -03:00
Malcrom 14367ca8c0 Scripting/Stand spell: Remove UNIT_FIELD_FLAGS change from spell script. 2014-09-14 12:37:04 -02:30
Shauren 2a1a294383 Scripts/Commands: Fixed build with -DSCRIPTS=0 2014-09-14 16:54:21 +02:00
Shauren a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
DDuarte a432bc7168 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-14 14:56:35 +01:00
Malcrom 716c2918d2 Scripting/Spell Stand: Move this spell to spells generic. 2014-09-14 11:15:25 -02:30
Vincent-Michael 3b0617ec45 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-13 23:29:43 +02:00
Vincent-Michael 5af2be7468 Scripts/Misc: Fix issues reported by static analysis 2014-09-13 23:15:00 +02:00
Vincent-Michael 0591ee53b5 Core/Misc: Fix merge fail 2014-09-13 22:59:28 +02:00
Vincent-Michael ca3961f987 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.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/Handlers/ChatHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
2014-09-13 22:38:25 +02:00
MitchesD d9fdbb06e4 Scripts/CoS: Salarmm rewritten to BossAI/EventMap 2014-09-13 21:39:26 +02:00
joschiwald 59baaeec48 Core/Chat: cleanup MonsterText methods 2014-09-13 20:41:31 +02:00
Vincent-Michael 11bb300c69 Script/CoS: Fix quest credit for mal ganis (but @Aokromes like more HACKS) 2014-09-13 19:14:32 +02:00
Nyeriah e746e8685c Scripts/UtigardePinnacle: Use a generic spell to calculate the damage for Dark Slash instead
Thanks to @Vincent_Michael for the heads up
2014-09-13 11:10:33 -03:00
Nyeriah 12e405bedd Scripts/UtgardePinnacle: King Ymiron
- Updated to EventMaps
- Replaced manual summons with proper spells
- Fixed glitch where boss would resume fight/run back to his main target before the ancestor summon roleplay was over (it might still need few adjustments i.e fire on boat is currently missing)
- Implemented damage calculation for spell Dark Slash (http://www.wowhead.com/spell=48292) as previously the spell would do no damage and it's BasePoints is 0
2014-09-13 10:33:51 -03:00
DDuarte b9b2a87d42 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-13 13:55:17 +01:00