Vincent-Michael
224c5c5d3d
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/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/World/World.h
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
src/server/worldserver/worldserver.conf.dist
2013-08-30 21:43:02 +02:00
Nay
7776016106
Core/Quests: Remove CastedCreatureOrGO method
...
- Remove EAI's ACTION_T_CAST_EVENT and ACTION_T_CAST_EVENT_ALL
- Remove SAI's SMART_ACTION_CALL_CASTEDCREATUREORGO
- Split QUEST_TRINITY_FLAGS_KILL_OR_CAST into QUEST_TRINITY_FLAGS_KILL and QUEST_TRINITY_FLAGS_CAST
- Assign QUEST_TRINITY_FLAGS_CAST to all the quests that were using RequiredSpellCastX
- (unrelated) Fix a warning in Player.cpp
- Replace CastedCreatureOrGO usage in scripts by KilledMonsterCredit
TODO: Convert the two EAI scripts commented out in the .sql to proper SAI
Closes #10667
2013-08-30 19:32:08 +01:00
Vincent-Michael
738a781468
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
2013-08-29 20:55:20 +02:00
Nay
62d1ee680b
Core/Quests: Drop world.quest_template.RequiredSpellCastX
...
These were non-wdb fields that didn't have much use.
Most quests that were using these fields (not many) should still work,
however, if you find any quest that worked before and is now broken
please report it in the issue tracker and it will be promptly fixed.
2013-08-29 15:36:38 +01: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
Aokromes
2bd4a479a6
Core/Quests: Add repeatable quest rate to world.reputation_reward_rate
2013-08-28 14:52:23 +01:00
Nay
78786c7b54
Core&Scripts: Fix clang compiler warnings
2013-08-27 23:47:03 +01:00
Nay
a7527b3b48
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/tools/map_extractor/mpq_libmpq04.h
2013-08-25 14:12:32 +01:00
jackpoz
ee3d3ab1ff
Core/Player: Fix uninitialized Player field.
...
m_MonthlyQuestChanged was initialized only when loading a Player from DB and left uninitialized when creating a new Player.
Valgrind log:
Conditional jump or move depends on uninitialised value(s)
at 0x1148E2A: Player::_SaveMonthlyQuestStatus(Trinity::AutoPtr<Transaction, ACE_Thread_Mutex>&) (Player.cpp:19694)
by 0x1146510: Player::SaveToDB(bool) (Player.cpp:19191)
by 0x14F5D5C: WorldSession::HandleCharCreateCallback(Trinity::AutoPtr<PreparedResultSet, ACE_Thread_Mutex>, CharacterCreateInfo*) (CharacterHandler.cpp:660)
Closes #10620
Signed-off-by: Nay <dnpd.dd@gmail.com >
2013-08-25 14:04:17 +01:00
Nay
12973de799
Core&Tools: Fix multiple issues found by a static code coverage tool
2013-08-24 22:57:22 +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
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
Vincent-Michael
da1e466bd5
Core/Misc: Implemented GetObjectScale function
2013-08-17 23:47:43 +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
f506ee3077
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
2013-08-11 18:37:31 +02:00
Nay
2abaf6224e
Core/Player: Add debug log when SendCanTakeQuestResponse(INVALIDREASON_*) is used
...
Intent is to find broken quest chains
Requested by Aokromes
2013-08-11 16:36:36 +01:00
Shauren
0e75857702
Core/PacketIO: Fixed object update failures
...
Closes #8105
2013-08-10 13:44:08 +02:00
Vincent-Michael
c0fc0f237f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/shared/DataStores/DBCFileLoader.h
2013-08-07 11:59:51 +02:00
Spp
b05665660a
Core/Battleground: Get rid of dinamic casts BattlegroundXX outside Battleground scope by implementing generic functions (1/2)
...
- HandleQuestComplete, CanActivateGO and IsSpellAllowed
2013-08-07 10:31:13 +02:00
Vincent-Michael
5af9056050
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-06 20:25:36 +02:00
Nay
ebaee135c9
Server/Player: Fix a logical mistake in ApplyEquipCooldown
...
Thanks Joschiwald
2013-08-06 18:19:18 +01:00
Nay
8dfaf27d25
Merge pull request #10245 from Mihapro/master
...
Core/SmartScripts
2013-08-06 08:55:41 -07:00
Nay
8dccf61005
Merge pull request #10445 from Discover-/Cooldown-Exploit
...
Core/Items: Fix an exploit where players would be able to reset the cool...
2013-08-06 08:35:57 -07:00
Nay
1bf1f95a8e
Merge pull request #10455 from Discover-/Battleground-Reinterpret-Casts
...
Core/Misc: Implement reinterpret casts for all battleground classes and ...
2013-08-06 08:31:59 -07:00
Discover-
7f744de746
Core/Misc: Implement reinterpret casts for all battleground classes and use them.
2013-08-06 13:26:52 +02:00
Vincent-Michael
c00c59c0f5
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.h
2013-08-05 11:54:21 +02:00
Aokromes
1dcd027426
Merge pull request #9761 from xjose93/ImproveLog11
...
Core/Logs: Added functions GetMapAreaAndZoneString() and GetCoordsMapAreaAndZoneString()
2013-08-05 01:13:52 -07:00
Discover-
4bb49378fc
Core/Items: Fix an exploit where players would be able to reset the cooldown of items to the equip cooldown (30 seconds) when unequipping, equipping and then relogging.
2013-08-04 23:10:21 +02:00
Vincent-Michael
75db5f8c17
Core/Misc: Fix logic fail in7770c820979ef1f49e8b5056efb780cd676e66c8
2013-07-24 23:09:24 +02:00
Vincent-Michael
3ef4975d60
Core/Spells: Fix death knight "Will of the Necropolis" for 4.3.4
2013-07-24 11:31:00 +02:00
Vincent-Michael
aca68428c2
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/TotemAI.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
2013-07-23 02:03:35 +02:00
Shauren
21c42bf5a7
Core/Creatures: Implemented new extended cost requirements and fixed some items requiring too much honor/conquest points
2013-07-22 19:52:18 +02:00
joschiwald
2d6a48840c
Core/Spells: use SpellInfo class to get spell rank instead of SpellMgr helpers
2013-07-21 13:37:34 +02:00
Nay
b87f794e16
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
2013-07-14 18:59:09 +01:00
Nay
b56b282eee
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/QuestHandler.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/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_jeklik.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_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/boss_kruul.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_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.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_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.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/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/scripts/World/item_scripts.cpp
2013-07-14 16:10:20 +01:00
Warpten
cd3a7f4175
Core/Players: Dueling players in your party / raid should not make them always detectable.
...
Fixes seeing stealthed rogues & druids, as well as invisible mages in duels.
2013-07-14 16:46:11 +02:00
Shauren
330dd624b6
Core/Movement: Do not remove movement flags that have special opcodes associated with them on teleport
...
Closes #10162
2013-07-13 15:26:10 +02:00
Shauren
30f6efb416
Core/Quests: Fixed quest sharing
2013-07-11 21:45:14 +02:00
Mihapro
e00fc19779
Core/SmartScripts
2013-07-08 18:01:41 +02:00
Warpten
37c048b8db
Core/Players: Fixed SMSG_DUEL_WINNER.
...
Closes #9401 .
2013-07-06 15:06:29 +02:00
Gacko
fb72716668
Fix typos in previous commit
2013-06-29 16:47:08 +02:00
Naios
642ed8a5d2
Core/PhaseMgr: Fixed an updateleak that occured if the rewarded quest hadn't requirements
...
* Fixed the range for phase ids in the phase_definition table
* solves http://www.trinitycore.org/f/topic/8737-condition-quest-rewarded-dosnt-work-instantly/
2013-06-29 15:44:32 +02:00
Shauren
66d8bdb943
Core/Units: Fixed a mistake that cause unroot packet not to be sent when stun was removed
2013-06-28 17:00:57 +02:00
Shauren
ab1fa7b3ad
Core/PacketIO: Implemented SMSG_WORLD_SERVER_INFO
2013-06-23 18:56:10 +02:00
Shauren
6bccfe997c
Merge fixups
2013-06-23 15:11:08 +02:00
Shauren
3f3a32df34
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-06-23 14:51:52 +02:00
Shauren
e74c0e9f00
Core/PacketIO: Updates and enabled a bunch of opcodes
2013-06-23 00:07:25 +02:00
Malcrom
e5a8f6cd98
Core: Fix some error messages, more useful, less engrish.
2013-06-22 02:05:32 -02:30
Shauren
365ac79100
Core/PacketIO: Allow to queue up to 3 time sync requests to prevent very long loading screns from printing cheater warnings
...
Closes #10063
2013-06-20 14:35:00 +02:00
Shauren
71386a5b2c
Core/Players: Fixed players getting stuck on loading screen when jumping through a portal
2013-06-19 11:58:08 +02:00