Commit Graph
2991 Commits
Author SHA1 Message Date
DDuarte 08003577de Merge branch 'master' into 4.3.4
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.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_nalorakk.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/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.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/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2014-01-11 17:26:22 +00:00
DDuarte 33c2bd5ce1 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.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_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.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_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
2014-01-10 18:32:05 +00:00
DDuarte 352a2682b1 Core&Scripts: Compile fix 2014-01-10 17:23:14 +00:00
joschiwald 41b613186e Core/Battlefield: some codestyle changes 2014-01-10 17:42:08 +01:00
DDuarte 3c9ae378f1 Core/Chat: Fix chat addon packets (languages & prefixes) 2014-01-10 06:30:22 +00:00
DDuarte 25d1be5a75 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlefield/Battlefield.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Texts/CreatureTextMgr.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.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_moonglade.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
2014-01-10 06:13:26 +00:00
joschiwald a60ba240b7 Core/Entities: add some log messages in CheckCreatureTemplate
* Happy Error Spam
2014-01-06 20:30:11 +01:00
Shauren 15cbe5858c Core/Movement: Fixed vehicle passengers disappearing clientside
Closes #11411
2014-01-06 13:51:40 +01:00
joschiwald cd76d32907 Core/Entities: correct creature damage, offhand damage should work too
* todo: some creatures need dmg_multiplier update in creature_template
2014-01-04 18:22:06 +01:00
Shauren 9d6904f03d Core/Vehicles
* Fixed vehicle orientation on transports
* Fixed exiting vehicles on moving transports
2014-01-02 14:20:05 +01:00
Vincent_Michael 20004050bc Update copyright note for 2014.
Happy new year.
2014-01-01 00:07:53 +01:00
Malcrom 3018ff4e6c Core/Creature: Obtain Attack power and base damage from creature_classlevelstats table. 2013-12-31 12:45:56 -03:30
Shauren 1cdc2e8c2a Core/Movement: Fixed creature movement on transports 2013-12-31 14:12:02 +01:00
Nawuko 6d21d33aac Core: user defined literals need a space in front 2013-12-30 20:35:37 +01:00
Shauren 079905e29a Core/Transports
* Fixed transport orientation
* Fixed transport position desynchronization for stoppable transports
* Ignore spawnMask errors for objects spawned on transports
2013-12-29 14:59:06 +01:00
Shauren 29acf99ea6 Core/Transports: Fixed new spawned transports not being visible for players already present on map 2013-12-28 12:44:22 +01:00
Malcrom fe95371d9a Core/Scripting: Replace casted with cast as casted is not a word. 2013-12-25 14:16:55 -03:30
Shauren 293915db39 Core/Quests: Fixed icon shown above questgivers with daily quests that have already been completed once by a character
Closes #11331
2013-12-25 02:08:05 +01:00
Shauren 107af52853 Core/Chat: Refactored building chat packets
* Moved everything into one specialized method instead of being scattered all over the place
* Allow localizing creature names in chat messages (when using $N)
* Send SMSG_GM_MESSAGECHAT for gm messages
2013-12-23 14:23:49 +01:00
Vincent_Michael 2ded11354d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-18 23:48:20 +01:00
Malcrom b8f9442ec9 Core/Player: Fix logic for questgiver cast spell 2013-12-16 18:50:51 -03:30
jackpoz b3c810a0fb Core/Misc: Fix warning
Partially revert f0a742a8c4 to fix a warning about unhandled switch case (the same case that Coverity reported as dead code) .
2013-12-16 19:52:50 +01:00
jackpoz e90a7f82d4 Core/AI: Fix CreatureAI left uninitialized
Fix CreatureAI left uninitialized for 1 server tick for Creatures with DeathState:DEAD . This is a workaround required after c9cf2f059f changes .

Valgrind log:
 Conditional jump or move depends on uninitialised value(s)
  at : npc_draenei_survivor::npc_draenei_survivorAI::MoveInLineOfSight(Unit*) (zone_azuremyst_isle.cpp:104)
  by : CreatureAI::MoveInLineOfSight_Safe(Unit*) (CreatureAI.cpp:123)
  by : CreatureUnitRelocationWorker(Creature*, Unit*) (GridNotifiers.cpp:134)
  by : Trinity::AIRelocationNotifier::Visit(GridRefManager<Creature>&) (GridNotifiers.cpp:252)
 Uninitialised value was created by a heap allocation
  at : operator new(unsigned long) (vg_replace_malloc.c:319)
  by : npc_draenei_survivor::GetAI(Creature*) const (zone_azuremyst_isle.cpp:66)
  by : ScriptMgr::GetCreatureAI(Creature*) (ScriptMgr.cpp:792)
  by : FactorySelector::selectAI(Creature*) (CreatureAISelector.cpp:41)
  by : Creature::AIM_Initialize(CreatureAI*) (Creature.cpp:716)
  by : Creature::AddToWorld() (Creature.cpp:190)
2013-12-15 21:14:47 +01:00
Malcrom a2e7191b26 Core/Unit: prevent COMMAND_ATTACK being added for Trained Rock Falcon.
Also added spells for Trained Rock Falcon to db.
2013-12-15 13:43:18 -03:30
jackpoz f0a742a8c4 Core/Misc: Remove unused code
Remove unused debugging code added in MaNGOS r5067.
Remove dead code from a switch found by Coverity.
2013-12-15 13:37:49 +01:00
w1sht0l1v3 89ee8cbac1 Core/Unit: Add switch to prevent COMMAND_ATTACK being added to action bar for supplied creature entries. 2013-12-15 14:09:49 +02:00
Vincent_Michael f7aedaef33 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/game/World/World.cpp
2013-12-15 03:47:21 +01:00
Malcrom dcfbe53552 Core/Player: Fix questgiver spell cast. 2013-12-14 20:22:39 -03:30
Discover- ec8e94c6ac Core/AI: Fix an issue where the OnQuestAccept hooks were not called for auto-completed quests.
Fixes #11304
2013-12-14 19:39:47 +01:00
jackpoz 1c0903e286 Core/Misc: Fix some static analysis issues
Fix some static analysis issues about uninitialized values. Most of them are false positives, always initialized before being accessed, while some of them are real issues spotted by valgrind too.
2013-12-14 18:41:26 +01:00
Malcrom dd546f073a Core/Player: Add another exception to questgiver spell casting. 2013-12-14 14:05:24 -03:30
Vincent_Michael 506ddbbf40 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-12 19:36:48 +01:00
Shauren 54fd53f7e3 Core/Movement: Fixed possible invalid memory access 2013-12-12 09:50:52 +01:00
Vincent_Michael 07024d3ea8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCEnums.h
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
2013-12-11 20:34:44 +01:00
trickerer 91ebea4a77 Don't allow units to enter combat upon death 2013-12-11 09:38:24 +07:00
Vincent_Michael ee5c47f1af Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-09 23:48:41 +01:00
jackpoz f418f4cf94 Core/Misc: Fix some static analysis issues
Fix some static analysis issues about uninitialized values in scripts.
Add spell id validation in Unit::SpellNonMeleeDamageLog() .
2013-12-08 22:04:30 +01:00
Vincent_Michael e8be55aa8b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/CoreAI/TotemAI.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/Guild.h
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.h
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
2013-12-08 20:27:46 +01:00
Malcrom 5c15e88da9 Core/Unit: Add switch to prevent COMMAND_ATTACK being added to action bar for supplied creature entries. 2013-12-08 11:55:28 -03:30
Warpten 98d2dbbd3f Core/Spells: Fixed rare issues where spell modifiers would not be correctly restored.
Happens in case of a spell having more than one modifier granted by an aura.
2013-12-08 15:06:10 +01:00
Malcrom af5d3daeab Core/Vehicle: Add an extra check for required energy before setting power. 2013-12-05 13:07:15 -03:30
jackpoz 7806b7c493 Core/Chat: Fix ChatFlood.MessageCount not being handled correctly
Fix Anti-flood chat system to always allow 1 more message than the count specified in the ChatFlood.MessageCount config parameter.
2013-12-03 21:47:52 +01:00
Malcrom 3485656aee Core/Player: GetRewSpellCast & GetRewSpell should not be cast by questgiver if effect type SPELL_EFFECT_LEARN_SPELL 2013-12-01 22:00:10 -03:30
jackpoz 04cc51a6cf Core/Misc: Fix some static analysis issues
Fix some static analysis issues, mostly false positive about fields not initialized in the constructor. It's good practice anyway to always initialize them.
2013-12-01 16:19:30 +01:00
jackpoz 788c8693a4 Core/Transports: Remove unused field
Remove unused Transport::_moveTimer field, static analysis complains about it being uninitialized.
2013-11-28 20:05:36 +01:00
joschiwald 1196b93e94 Core: fix build 2013-11-26 18:14:01 +01:00
joschiwald 9a0bb93b33 Scripts: fix warning and cleanup npc_apprentice_mirveda 2013-11-24 21:49:51 +01:00
joschiwald 2c307aa67c Scripts/Oculus: cleanup a bit 2013-11-24 21:17:45 +01:00
Malcrom 6ba4d70b5c Core/Player: Allow questgiver, if npc, to cast quest RewSpellCast & RewSpell rather than player. 2013-11-23 00:17:37 -03:30
joschiwald 82d4ed5615 Core/Movement: fix player fall under ground on teleport 2013-11-21 16:13:13 +01:00