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
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
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
joschiwald
9a0bb93b33
Scripts: fix warning and cleanup npc_apprentice_mirveda
2013-11-24 21:49:51 +01:00
Shauren
1966a78b9f
Core/Movement: Backported spline stop fix from 4.3.4 branch - use Stop spline type for stopping movement instead of starting movement that ends in creature's current position
2013-11-10 18:52:20 +01:00
Spp
ab2d26cb91
Merge branch 'master' into 4.3.4
...
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/Conditions/ConditionMgr.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DungeonFinding/LFGMgr.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/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/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/Spell.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/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/worldserver/worldserver.conf.dist
2013-11-08 11:12:17 +01:00
Spp
94e2b9332a
Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive)
2013-11-08 10:50:51 +01:00
Spp
990e4c7851
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/Entities/Creature/Creature.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/Grids/Notifiers/GridNotifiers.h
src/server/game/Grids/ObjectGridLoader.h
src/server/game/Spells/SpellInfo.h
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/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.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/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.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/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/tools/map_extractor/System.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
2013-11-08 10:29:51 +01:00
leguybrush
0a308144a8
Core/Code: Unify [more] codestyle for brackets: )\n{\n} to ) { }.
2013-10-28 14:36:07 -04:00
Shauren
75a790ca47
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-26 17:06:50 +02:00
Shauren
b81bf7d025
Core/Spells: Implemented additional conditions for spells that start cooldown after an event instead of after cast
2013-10-26 14:39:00 +02:00
Shauren
06f5011071
Core/Auras: Added serverside checking for UNIT_FLAG_PACIFIED when attempting to start melee attack
...
Closes #8623
2013-10-22 17:09:41 +02:00
Discover-
1a6157985c
Core/Misc: Get rid of some useless code
2013-10-21 09:15:17 +02:00
Shauren
b6db622b52
Core/Transports: Fixed crashes happening when passenger is removed from transport during teleport
...
Closes #11067
2013-10-20 14:27:17 +02:00
Shauren
ce55647c41
Core/Transports
...
* Rewritten path generation, now uses splines - timers are a lot more accurate now
* Implemented stopping transports
* Implemented spawning transports in instances
* Implemented spawning gameobjects as transport passengers
* Transport passengers are now stored in creature/gameobject table using gameobject_template.data6 from transport's template as map id
2013-10-16 18:37:29 +02:00
Vincent-Michael
9128088877
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-15 23:35:40 +02:00
Discover-
82eda3244a
Core/Misc: Ugh.. Fix recent commit that broke the OnHeal hook 😥
2013-10-14 16:56:09 +02:00
Discover-
db848f2045
Core/Misc: Fix build after 731b3670fe (again..)
2013-10-12 13:41:00 +02:00
Shauren
fca4a5448a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-07 14:30:37 +02:00
Shauren
1d3e3fac89
Build fix
2013-10-06 12:09:05 +02:00
Shauren
9d19e4d0ac
Core/Commands: Restored old functionality of getSelectedPlayer in chat commands
...
Also fixed build
2013-10-06 11:28:25 +02:00
Shauren
21a64d8fb4
Merge pull request #10976 from avengerweb/master
...
Core/Spells: Spells with SPELL_ATTR3_IGNORE_HIT_RESULT can never miss!
2013-10-06 02:19:19 -07:00
Discover-
36e6407e24
Merge pull request #10981 from Lillecarl/hookz
...
Implement OnDamage and OnHeal hooks
2013-10-04 02:55:23 -07:00
Shauren
a368fae588
Core/Players: Fixed issues with incorrect targets being selected for spells
2013-10-03 17:07:25 +02:00
Shauren
993513ce8d
Core/Vehicles: Fixed a crash happening when a minion vehicle despawns with passenger on it
...
Ref #9738
2013-10-02 00:13:00 +02:00
Shauren
770f69d4e6
Core/Vehicles: Fixed calling Vehicle::Uninstall on freed memory
...
Valgrind log:
==7723== Invalid read of size 8
==7723== at 0x10753CE: Vehicle::GetBase() const (Vehicle.h:51)
==7723== by 0x1072449: Vehicle::Uninstall() (Vehicle.cpp:159)
==7723== by 0x10B1E3C: Unit::RemoveVehicleKit() (Unit.cpp:15946)
==7723== by 0x10A8F32: Unit::RemoveFromWorld() (Unit.cpp:13441)
==7723== by 0x11A4703: Creature::RemoveFromWorld() (Creature.cpp:203)
==7723== by 0x11B9AB7: TempSummon::RemoveFromWorld() (TemporarySummon.cpp:279)
==7723== by 0x11B9C6C: Minion::RemoveFromWorld() (TemporarySummon.cpp:308)
==7723== by 0x10A917C: Unit::CleanupBeforeRemoveFromMap(bool) (Unit.cpp:13482)
==7723== by 0x10A926C: Unit::CleanupsBeforeDelete(bool) (Unit.cpp:13504)
==7723== by 0x12DBB89: Map::AddObjectToRemoveList(WorldObject*) (Map.cpp:2108)
==7723== by 0x10F4556: WorldObject::AddObjectToRemoveList() (Object.cpp:2140)
==7723== by 0x11B99C5: TempSummon::UnSummon(unsigned int) (TemporarySummon.cpp:256)
==7723== Address 0x3bd20530 is 64 bytes inside a block of size 168 free'd
==7723== at 0x4C2B59C: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==7723== by 0x1071FD3: Vehicle::~Vehicle() (Vehicle.cpp:66)
==7723== by 0x10B1E71: Unit::RemoveVehicleKit() (Unit.cpp:15947)
==7723== by 0x10A8F32: Unit::RemoveFromWorld() (Unit.cpp:13441)
==7723== by 0x11A4703: Creature::RemoveFromWorld() (Creature.cpp:203)
==7723== by 0x11B9AB7: TempSummon::RemoveFromWorld() (TemporarySummon.cpp:279)
==7723== by 0x11B9C6C: Minion::RemoveFromWorld() (TemporarySummon.cpp:308)
==7723== by 0x10A917C: Unit::CleanupBeforeRemoveFromMap(bool) (Unit.cpp:13482)
==7723== by 0x10A926C: Unit::CleanupsBeforeDelete(bool) (Unit.cpp:13504)
==7723== by 0x12DBB89: Map::AddObjectToRemoveList(WorldObject*) (Map.cpp:2108)
==7723== by 0x10F4556: WorldObject::AddObjectToRemoveList() (Object.cpp:2140)
==7723== by 0x11B99C5: TempSummon::UnSummon(unsigned int) (TemporarySummon.cpp:256)
2013-10-01 22:06:39 +02:00
Carl Hjerpe
8737984b71
Implement script hooks: OnDamge, OnHeal
2013-10-01 18:35:09 +02:00
Ellie
1fae858645
Whitespace between string literals and user-defined literals is now mandatory for concatenation in C++11
2013-10-01 01:13:13 -07:00
Vadim
2320f6d28f
Core/Spells: Spells with SPELL_ATTR3_IGNORE_HIT_RESULT can`t never miss!
2013-09-30 13:43:02 +04:00
Warpten
7f3240677a
Core/Units: Fixed Moonkin forms for Trolls and Worgens, as well as epic Flight forms.
...
Also (hack?)fixed Glyph of Arctic Wolf.
2013-09-19 17:39:09 +02:00
Vincent-Michael
3166638078
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
2013-08-28 19:24:01 +02:00
Nay
78786c7b54
Core&Scripts: Fix clang compiler warnings
2013-08-27 23:47:03 +01:00
Nay
14d80d269d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Globals/ObjectMgr.cpp
2013-08-27 16:10:11 +01:00
Nay
cc14e18664
Core/Misc: Fix compiler warnings
2013-08-27 16:06:18 +01:00
Nay
b2134dbbe3
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
2013-08-26 12:40:41 +01:00
Nay
8eaf763235
Core&Tools: Fix multiple issues found by a static code coverage tool
2013-08-26 02:00:18 +01:00
Shauren
d612a6a1e3
Core/PacketIO: Fixed object update failures caused by bad data in fall info
2013-08-23 18:27:42 +02:00
Vincent-Michael
34cd8e808e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
2013-08-20 17:48:18 +02:00
Shauren
75cc4e7b25
Core/Auras
...
* Fixed unsafe removal of charm auras, it is now safe to remove them inside AI hooks
* Fixes crash in SmartAI::EnterEvadeMode
Closes #8679
2013-08-20 00:43:03 +02:00
Vincent-Michael
f16f427c48
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
src/server/scripts/Spells/spell_hunter.cpp
2013-08-18 18:13:14 +02:00
joschiwald
2b19ba1879
Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes
2013-08-18 01:41:10 +02:00
joschiwald
c45e665c86
Core/Spells: move spell resistance calculation into separate function (and some cosmetic changes)
...
Ref #7254
2013-08-17 00:47:44 +02:00
Vincent-Michael
74689b1d93
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-16 18:35:54 +02:00