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
Duarte Duarte
14512d6abb
Core: MSG_NULL_ACTION was renamed to NULL_OPCODE in this branch
...
Fix build
2014-01-10 06:50:59 +00: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
Subv
dffa010f8a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
2013-12-31 12:57:10 -05: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
Shauren
9a1282aac6
Core/Spells: Fixed movement from SPELL_EFFECT_PULL_TOWARDS_DEST
2013-12-31 13:08:45 +01:00
Subv
84b20f07e8
Core/MMaps: Clear the points on each CalculatePath call and allow for shortcut paths in case no path is available.
2013-12-30 18:47:34 -05:00
Subv
64ab810595
Tools/MeshExtractor: Corrected a mistake.
2013-12-30 15:31:12 -05:00
Subv
b2728cf1a0
Tools/MeshExtractor: Added some debug messages
2013-12-30 15:19:50 -05:00
Subv
5145281435
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
2013-12-30 14:51:49 -05:00
Subv
6ec7b03f9b
Merge pull request #11386 from Nawuko/vincent-fix
...
Core: user defined literals need a space in front
2013-12-30 11:41:50 -08:00
Nawuko
6d21d33aac
Core: user defined literals need a space in front
2013-12-30 20:35:37 +01:00
jackpoz
799daaae55
Core/Transports: Fix array overflow
...
Fix an array overflow in TransportMgr::GeneratePath() spline code.
Valgrind log:
Invalid read of size 4
at : G3D::Vector3::operator*(float) const (Vector3.h:650)
by : Movement::C_Evaluate(G3D::Vector3 const*, float, G3D::Matrix4 const&, G3D::Vector3&) (Spline.cpp:103)
by : Movement::SplineBase::SegLengthCatmullRom(int) const (Spline.cpp:171)
by : Movement::SplineBase::SegLength(int) const (in /home/jackpoz/trinity/bin/worldserver)
by : Movement::Spline<double>::initLengths() (SplineImpl.h:86)
by : TransportMgr::GeneratePath(GameObjectTemplate const*, TransportTemplate*) (TransportMgr.cpp:125)
by : TransportMgr::LoadTransportTemplates() (TransportMgr.cpp:78)
Address 0x1d07d154 is 8 bytes after a block of size 300 alloc'd
2013-12-30 16:15:37 +01:00
Subv
d234d0f3d0
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
2013-12-29 15:13:14 -05: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
jackpoz
3744c14184
Scripts/Misc: Ensure Creatures are in instances when required
...
Create ScriptedAIs that require a InstanceScript reference only if the InstanceScript exists, so if these Creatures are in an instance. ScriptedAIs that don't require a InstanceScript reference have not been modified.
This fixes many possible NULL dereference crashes happening when spawning a scripted Creature outside of an instance.
Fixed a GetOwner() and a ToPlayer() NULL dereference crashes too.
2013-12-29 01:19:52 +01:00
Shauren
533180f2a1
Core/Battlegrounds: Removed unneeded code
2013-12-28 13:02:05 +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
jackpoz
e255d1d376
Core/Transports: Fix possible crash
...
Fix a crash happening when deleting an instance with transports. This case doesn't appear in current sources but could have happened in ICC and HoR.
2013-12-25 23:11:22 +01:00
Malcrom
01a43e6a30
Core/QuestDef: Well I clicked revert but Git didn't play along.
2013-12-25 14:31:28 -03:30
Malcrom
fe95371d9a
Core/Scripting: Replace casted with cast as casted is not a word.
2013-12-25 14:16:55 -03:30
Shauren
890b47c861
Build fix
2013-12-25 12:37:00 +01:00
Shauren
8bcde41538
Core/Quests: Added stuff missing in previous commit
2013-12-25 12:17:23 +01:00
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
20a2b69178
Core/Chat: Fixed GM messages in chat channels after refactoring
2013-12-24 20:21:13 +01:00
Shauren
5e8f829181
Core/SAI: Fixed a crash in call for help/flee for assist actions when they had an emote attached
2013-12-24 11:26:07 +01:00
Shauren
a316b86a79
Core/Spells: Prevent adding sockets to items that have 3 sockets in item_template or already had a socket added to them
2013-12-23 14:25:34 +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
8658b5338c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
...
Conflicts:
src/server/collision/Management/MMapManager.cpp
src/server/game/Maps/Map.cpp
src/server/game/Movement/PathGenerator.cpp
2013-12-20 17:39:13 +01:00
Vincent_Michael
736093e91b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/scripts/Kalimdor/zone_silithus.cpp
2013-12-20 17:26:27 +01:00
Discover-
c5788de8a4
Core/SAI: Fix another memory leak, thanks to @Xter
2013-12-19 10:50:16 +01:00
Discover-
e44e932d4d
Core/SAI: Fix two memoryleaks in my previous commits. Thanks to @Xter for the notice.
2013-12-19 10:28:45 +01:00
Spp
ec62bc6e88
Core/Dungeon Finder: Improve join log message to try to detect cases when one of the selected dungeons is 0
...
* Added specialization to all loggers related to lfg (allows to enable "lfg.join" in debug mode and keep all the rest in error)
2013-12-19 09:39:00 +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
Discover-
e5f7beecf5
Core/SAI: Using SMART_ACTION_FORCE_DESPAWN now despawns the given target_type instead of always the creature itself.
2013-12-18 10:06:19 +01:00
Discover-
a0f7fee922
Core/SAI: Fix compile
...
Core/SAI: Don't limit SMART_ACTION_SET_INGAME_PHASE_MASK to unit targets only. Thanks to @Shauren for the notice.
2013-12-17 11:38:29 +01:00
Discover-
154ee466eb
Core/SAI: Using the action_type SMART_ACTION_SET_REACT_STATE now sets the react state of the target_type. Won't break any scripts as all current cases of this action_type have target_type 1 (SMART_TARGET_SELF).
2013-12-17 11:10:23 +01:00
Discover-
1f4d585bef
Core/SAI: In all npc flag related action_types we now check if the target is a creature instead of an unit (creature/player).
2013-12-17 11:06:07 +01:00
Discover-
20a22662df
Core/SAI: Using SMART_ACTION_SET_FOLLOW with target_type 0 (SMART_TARGET_NONE) will now stop the following completely. Fixes 6 scripts in a clean TDB already using this functionality even though it wasn't implemented.
2013-12-17 10:12:23 +01:00
Discover-
54b7162f1d
Core/SAI: Make SMART_ACTION_SET_INGAME_PHASE_MASK set the phasemask of the target_type instead of always the source calling the action type.
2013-12-17 09:44:06 +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
b8908606fc
Core/AH: Fix memory leak
...
Fix memory leak in Auction House when creating an auction with stackable items and a stack of the same amount in the inventory. Leak added in 15a2acfb52 .
2013-12-16 19:38:49 +01:00
Malcrom
f1a82a578b
Core/Waypoints: Stop creatures from skipping at waypoint nodes
...
and add smoothing to pathing.
2013-12-15 20:26:11 -03:30
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
jackpoz
dd4a774c4c
Core/Transports: Fix memory leak on shutdown
...
Fix world transports not being deleted on shutdown.
2013-12-15 18:51:34 +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