ariel-
e34e3f379f
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Conflicts:
.travis.yml
CMakeLists.txt
README.md
dep/libmpq/CMakeLists.txt
doc/UnixInstall.txt
revision_data.h.in.cmake
sql/base/auth_database.sql
sql/base/characters_database.sql
sql/base/dev/world_database.sql
sql/old/3.3.5a/auth/59_2015_11_07/2015_08_21_00_auth.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_01_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_16_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_18_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_18_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_00_world_2015_07_18_04.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_20_02_world_2015_07_19_35.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_21_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_06_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_07_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_06_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_27_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_27_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_02_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_02_01_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_03_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_04_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_09_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_23_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_25_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_25_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_26_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_26_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_27_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_01_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_02_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_02_03_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_03_05_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_06_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_08_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_08_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_10_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_10_01_world_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_05_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_16_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_18_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_18_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_05_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_21_00_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_00_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_01_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_02_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_03_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_04_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_06_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_07_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_03_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_04_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_26_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_26_05_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_27_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_27_01_world.sql
sql/updates/world/2015_07_14_02_world.sql
sql/updates/world/2015_07_14_03_world.sql
sql/updates/world/2015_07_14_04_world.sql
sql/updates/world/2015_07_14_05_world.sql
sql/updates/world/2015_07_15_00_world.sql
sql/updates/world/2015_07_15_01_world.sql
sql/updates/world/2015_07_15_02_world.sql
sql/updates/world/2015_07_16_00_world.sql
sql/updates/world/2015_07_17_00_world.sql
sql/updates/world/2015_07_17_01_world.sql
sql/updates/world/2015_07_17_02_world.sql
sql/updates/world/2015_07_17_03_world.sql
sql/updates/world/2015_07_17_04_world.sql
sql/updates/world/2015_07_18_00_world.sql
sql/updates/world/2015_07_18_01_world.sql
sql/updates/world/2015_07_19_01_world.sql
sql/updates/world/2015_07_19_02_world.sql
sql/updates/world/2015_07_19_03_world.sql
sql/updates/world/2015_07_19_04_world.sql
sql/updates/world/2015_07_19_05_world.sql
sql/updates/world/2015_07_21_00_world.sql
sql/updates/world/2015_07_24_00_world.sql
sql/updates/world/2015_07_24_01_world.sql
sql/updates/world/2015_07_24_02_world.sql
sql/updates/world/2015_07_24_03_world.sql
sql/updates/world/2015_07_24_04_world.sql
sql/updates/world/2015_07_24_06_world.sql
sql/updates/world/2015_07_24_07_world.sql
sql/updates/world/2015_07_25_00_world.sql
sql/updates/world/2015_07_25_01_world.sql
sql/updates/world/2015_07_25_02_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
sql/updates/world/2015_07_26_00_world.sql
sql/updates/world/2015_07_26_04_world.sql
sql/updates/world/2015_07_26_05_world.sql
sql/updates/world/2015_07_26_06_world.sql
sql/updates/world/2015_07_27_00_world.sql
sql/updates/world/2015_07_27_01_world.sql
sql/updates/world/2015_07_28_02_world.sql
sql/updates/world/2015_07_28_03_world.sql
sql/updates/world/2015_08_13_00_world.sql
sql/updates/world/2015_08_13_01_world.sql
sql/updates/world/2015_08_13_02_world.sql
sql/updates/world/2015_08_13_03_world.sql
sql/updates/world/2015_08_13_04_world.sql
sql/updates/world/2015_08_21_00_world.sql
sql/updates/world/2015_08_21_01_world.sql
sql/updates/world/2015_08_21_02_world.sql
sql/updates/world/2015_08_23_00_world.sql
sql/updates/world/2015_08_25_00_world.sql
sql/updates/world/2015_08_25_01_world.sql
sql/updates/world/2015_08_26_00_world.sql
sql/updates/world/2015_08_26_01_world.sql
sql/updates/world/2015_08_27_00_world.sql
sql/updates/world/2015_08_29_02_world.sql
sql/updates/world/2015_08_29_03_world.sql
sql/updates/world/2015_08_29_04_world.sql
sql/updates/world/2015_09_01_00_world_335.sql
sql/updates/world/2015_09_05_00_world.sql
sql/updates/world/2015_09_05_01_world.sql
sql/updates/world/2015_09_06_00_world.sql
sql/updates/world/2015_09_08_01_world.sql
sql/updates/world/2015_09_08_02_world.sql
sql/updates/world/2015_09_11_00_world_from_335.sql
sql/updates/world/2015_09_11_01_world_from_335.sql
sql/updates/world/2015_09_11_02_world_from_335.sql
sql/updates/world/2015_09_11_03_world_from_335.sql
sql/updates/world/2015_09_11_04_world_from_335.sql
sql/updates/world/2015_09_11_05_world_from_335.sql
sql/updates/world/2015_09_11_06_world_from_335.sql
sql/updates/world/2015_09_11_07_world_from_335.sql
sql/updates/world/2015_09_11_08_world_from_335.sql
sql/updates/world/2015_09_11_09_world_from_335.sql
sql/updates/world/2015_09_11_10_world_from_335.sql
sql/updates/world/2015_09_11_11_world_from_335.sql
sql/updates/world/2015_09_11_12_world_from_335.sql
sql/updates/world/2015_09_11_13_world_from_335.sql
sql/updates/world/2015_09_11_16_world_from_335.sql
sql/updates/world/2015_09_11_17_world_from_335.sql
sql/updates/world/2015_09_11_18_world_from_335.sql
sql/updates/world/2015_09_11_21_world_from_335.sql
sql/updates/world/2015_09_11_40_world_from_335.sql
sql/updates/world/2015_09_11_41_world_from_335.sql
sql/updates/world/2015_09_11_43_world_from_335.sql
sql/updates/world/2015_09_11_51_world_from_335.sql
sql/updates/world/2015_09_11_52_world_from_335.sql
sql/updates/world/2015_12_14_00_world.sql
sql/updates/world/2016_01_01_00_world.sql
sql/updates/world/2016_01_01_01_world.sql
src/common/Common.h
src/common/Cryptography/Authentication/AuthCrypt.cpp
src/common/Cryptography/Authentication/AuthCrypt.h
src/common/Cryptography/HMACSHA1.cpp
src/common/Cryptography/HMACSHA1.h
src/server/database/Database/Implementation/CharacterDatabase.cpp
src/server/database/Database/Implementation/CharacterDatabase.h
src/server/database/Database/Implementation/LoginDatabase.cpp
src/server/game/AI/SmartScripts/SmartScript.cpp
src/server/game/AI/SmartScripts/SmartScript.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlefield/Battlefield.cpp
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundQueue.cpp
src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Chat/Chat.h
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
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/DynamicObject/DynamicObject.cpp
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/ObjectGuid.cpp
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Transport/Transport.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Globals/ObjectAccessor.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Grids/GridDefines.h
src/server/game/Grids/ObjectGridLoader.cpp
src/server/game/Groups/Group.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Handlers/TaxiHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Maps/Map.cpp
src/server/game/Maps/Map.h
src/server/game/Maps/MapInstanced.cpp
src/server/game/Maps/MapManager.h
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/Miscellaneous/Language.h
src/server/game/Movement/Waypoints/Path.h
src/server/game/OutdoorPvP/OutdoorPvP.cpp
src/server/game/OutdoorPvP/OutdoorPvP.h
src/server/game/Pools/PoolMgr.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Scripting/MapScripts.cpp
src/server/game/Scripting/ScriptMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
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/SpellHistory.cpp
src/server/game/Spells/SpellHistory.h
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/Spells/SpellMgr.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/game/Tools/PlayerDump.cpp
src/server/game/Tools/PlayerDump.h
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_gobject.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_npc.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.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_gahzranka.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_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/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_felwood.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/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/World/duel_reset.cpp
src/server/scripts/World/npc_taxi.cpp
src/server/shared/Containers.h
src/server/shared/Dynamic/TypeContainer.h
src/server/shared/Dynamic/TypeContainerFunctions.h
src/server/shared/Dynamic/TypeList.h
src/server/shared/Packets/WorldPacket.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/loadlib.cpp
src/tools/map_extractor/loadlib/loadlib.h
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/loadlib/loadlib.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/vmapexport.cpp
src/tools/vmap4_extractor/wdtfile.cpp
src/tools/vmap4_extractor/wdtfile.h
src/tools/vmap4_extractor/wmo.cpp
2016-01-15 00:15:35 -03:00
treeston
78228b59ab
Scripts/Naxxramas: Gothik the Harvester rework:
...
- Move TeleportTo hack to proper spell casts
- Add missing lines to boss
- Fix add spawn timings
- Fix visuals
- Fix logic for gate opening
- Fix add aggro behavior
- Fix add casting AI
- Fix some other stuff I probably forgot
2016-01-13 16:27:35 +01:00
treeston
5b8b8c6530
Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089 )
2016-01-13 15:33:17 +01:00
treeston
2da458c56d
Scripts/Instances: Complete rewrite of the boundary system.
...
- Migrate boundary logic to Maps/AreaBoundary instead of having it sit in InstanceScript (to possibly allow use for other purposes).
- Implement the first five boundary types in Maps/AreaBoundary.cpp.
- Add boundary checks to Creature's update logic
- Add boundary data for all Northrend raids
- Add boundary initialization structures and methods to InstanceScript
- Modify EnterEvadeMode signature. It now passes a value from the EvadeReason enum as parameter to allow special casing depending on evade reason
- Remove previous (weird) boundary code that had them linked to GO spawns
2016-01-12 22:24:23 +01:00
Kittnz
529899675a
Merge pull request #16245 from sirikfoll/Turkinator
...
Core/Spells Implement SpellScript needed for Achievement The Turkinator
2016-01-12 21:04:24 +01:00
treeston
3ea6324507
Merge remote-tracking branch 'tkrokli/npc_myranda_the_hag' into 3.3.5-base
2016-01-12 19:18:13 +01:00
treeston
9091451818
Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base
2016-01-12 19:17:39 +01:00
treeston
6710beed75
Merge remote-tracking branch 'tkrokli/npc_shadowfang_prisoner' into 3.3.5-base
2016-01-12 19:17:25 +01:00
treeston
e203d78d2a
Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base
2016-01-12 18:32:51 +01:00
sirikfoll
fc2a570d09
Core/Spells Implement SpellScript needed for Achievement The Turkinator
...
Closes #3997
2016-01-12 15:24:55 -02:00
tkrokli
76d5dbad4b
[3.3.5] Core/Script: move Myranda the Hag's gossip option to DB
...
Removing hardcoded text from the core script and into the DB:
"I am ready for the illusion, Myranda."
This quest is 3.3.5 *only*. Removed in patch 4.0.3a.
Addendum: enum ILLUSION_GOSSIP = 4773 , instead of "magic number".
2016-01-12 17:37:18 +01:00
tkrokli
22dd523c1f
Core/Scripts: move GOSSIP_ACCEPT_DUEL to DB
...
Another attempt to shorten the list of hardcoded gossip menu options.
This is the gossip menu option of the NPC ID 28406, Death Knight Initiate
in Death's Breach in the Scarlet Enclave, the death knight starting area.
This gossip is tied to the quest "Death's Challenge".
Removing this text in the core script: "I challenge you, death knight!"
(#define GOSSIP_ACCEPT_DUEL) and using `ADD_GOSSIP_ITEM_DB()`
to pull the gossip_menu_option 9765 from the database instead.
2016-01-12 10:18:44 +01:00
tkrokli
95a2eec923
Core/Scripts: move npc_shadowfang_prisoner gossip option to DB
...
Getting rid of one more incorrect and hardcoded text
which now will be read correct and from the DB instead.
Wrong text: "Thanks, I'll follow you to the door." (core)
Correct text: "Please unlock the courtyard door." (DB)
Thanks to @Aokromes, @r00ty, @velinath, @Nayd, @Treeston, @Zedron
and lots of other regular TrinityCore developers and members for the
inspiration and motivation, as well as helpfulness along the way.
2016-01-12 09:50:04 +01:00
ariel-
d04d14e34d
Update copyright note for 2016
2016-01-11 23:27:45 -03:00
Shauren
6b7c6f4366
Core/Players: Implemented serverside validation of reserved/profane names
...
Closes #15357
New library dependency: Boost.Regex
(cherry picked from commit b564c10b131de03cf107
2016-01-11 23:27:43 -03:00
ariel-
446cb1e5c5
Port relevant cooldown category handling and Duel Cooldown reset script
...
Core/Spells: Cooldown updates
Core/Player: implement ResetCoolDownAfterDuel configurable feature
Core/Player rewritten duel CD reset system
Core/Spells: fixed some rare stealth/prowl visual bugs after duel cd reset
Core/Spells: Improved spell category cooldown handling
* Category cooldown is stored with the spell that started the cooldown (and only resetting cooldown on that spell will clear cooldowns on entire category - this fully mirrors client behavior)
* This significantly reduces the amount of data saved to database for cooldowns
* Spell casts from items that have a different category specified than on spell will now check for cooldown during the cast
Core/Misc: Warning fix
Scripts/DuelReset:
- impemented health and mana reset
- do not reset anything when duel is interrupted
Scripts/DuelReset:
- fixed druid mana restoration
- fixed bug when a player accepts duel with a spel on onHold true (like when stealth of rogue/druid is active)
Core/Spells: Fixed Raise Dead cooldown
Core/Spells: Fixed typo in ecbbcc8972
2016-01-11 14:51:30 -03:00
Shauren
af41a70fe8
Core/Commands: Refactored chat command script hook, fixes a crash when building with gcc 5
...
Closes #15616
Closes #15740
(cherry picked from commit 2d942ddcc5
2016-01-11 01:51:52 -03:00
jackpoz
5ebfe5a297
Scripts/EyeOfEternity: Fix crash
...
Fix crash happening when a player would kill a Melee npc on the disks during Malygos fight and mount it before it ended the waypoint path.
Close #15900
(cherry picked from commit 6e296ddaa2
2016-01-11 01:51:46 -03:00
Shauren
ce7fc03930
Core/World: Store account id in CharacterInfo to reduce the amount of database queries
...
(cherry picked from commit aaaa1c34414a36850167
2016-01-11 01:51:04 -03:00
pete318
6664a3acc3
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
...
(cherry picked from commit b1032ed620
2016-01-11 01:50:53 -03:00
ariel-
b20c9ae283
Corpses update: cd27fd38b9
2016-01-11 01:50:49 -03:00
ariel-
b3ea9fbbe5
Map local guids 6.x -> 4.3.4
...
Ported the following commits:
ca83e14f8bee1c1b97be18e4ab6911bf37446b3ccb854a2b7b
2016-01-11 01:50:45 -03:00
jackpoz
e59b4324b8
Merge pull request #15977 from tkrokli/landmine_knockback_achievement
...
Scripts/Spells: Mine Sweeper achievement
2016-01-09 23:19:09 +01:00
jackpoz
4191bb868a
Scripts/ICC: Fix static analysis issue
...
Fix an issue reported by static analysis
2016-01-09 21:53:53 +01:00
velinath
d87f504b53
Core/Scripts/DB: Migrate specially scripted taxi NPC's to SmartAI
2016-01-09 14:39:07 -05:00
jackpoz
e138e094a9
Scripts/Commands: Modify ".setskill" command to target current Player by default
2016-01-09 18:37:17 +01:00
jackpoz
b1d0855624
Core/Spells: Fix static analysis issues and a crash
...
Fix confusing NULL checks in Raise Ally check cast.
Fix a crash in Raise Ally triggered by executing ".cast back 61999" command targeting a pet in raid while being dead.
2016-01-08 23:13:15 +01:00
Saben65
ad425f9f17
Scripts/Shadowmoon Valley: Dragonmaw Peon
...
Fixes issue where NPC does not attack, even when aggro'd.
Fixes #16210
Closes #16204
2016-01-08 22:19:56 +01:00
Francesco Borzì
3e42d83e9c
Merge pull request #16208 from ShinDarth/putricide-fix
...
[3.3.5] Scripts/ICC: Fixed Professor Putricide
2016-01-08 11:13:22 +01:00
ShinDarth
b1a89943a2
Scripts/ICC: Fixed Professor Putricide
...
- closes https://github.com/TrinityCore/TrinityCore/issues/16207
2016-01-08 10:33:16 +01:00
ccrs
e5d4005cc6
Core/Spells: Fixed Raise Ally
...
thx @Nayd for sniffs :)
thx @Shauren for helping to find all spell involved
* There is no implementation for stats update on Puppet class (only on Guardian) so same SummonProperty as Raise Dead Ghoul (non pet) is used.
(Default SummonProperties set category to SUMMON_CATEGORY_PUPPET)
* Override the Summon Effect to enable charm and stats scaling.
* PlayerAI is used to handle unaura on ghoul despawn or dead.
It's necessary due to the fact that all script hooks on ScriptedCreature are called on an unactive CreatureAI, resulting in creature being unable to handle unaura calls.
* Create UpdateAI call for Player class
* Stats scaling is based on forum and wowhead comments, they recall this ghoul as a copy of the other one (same stats).
* Spellscript for Ghoul spell Thrash
Closes #82
Closes #14830
2016-01-08 00:10:15 +01:00
velinath
4e4ef26108
Core/Scripts/DB: Migrate Wing Commander Dabir'ee to SAI
2016-01-05 19:23:48 -05:00
treeston
1d9d03b289
Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-base
2016-01-05 23:36:57 +01:00
Andrew Letson
9e366b36ae
Core/Scripts/DB: Migrate Skyguard Handler Deesak to SmartAI
2016-01-05 16:38:55 -05:00
velinath
f21199dbc9
Core/Scripts/DB: Migrate Skyguard Handler Irena to SAI
2016-01-04 20:23:01 -05:00
jackpoz
f22b1938db
Scripts/Commands: Modify ".learn" command to target current Player by default
2016-01-04 22:44:19 +01:00
velinath
295f76d77c
Core/Scripts: remove npc_taxi unused scripts
2016-01-04 09:14:03 -05:00
joschiwald
f377a5875c
Merge pull request #16171 from velinath/sai-migrations
...
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
2016-01-04 00:32:10 +01:00
velinath
caff65bdb1
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
2016-01-03 18:30:47 -05:00
joschiwald
8a0bbc3869
Core/Spells: Fixed Enrage armor reduce part
2016-01-03 00:55:50 +01:00
joschiwald
35aed8902a
Scripts/Taxi: addition to 660f7e72be
2016-01-02 23:57:56 +01:00
tkrokli
b0da73fc5d
Core/Scripts/DB: move Wyrmrest Temple taxi FP to SAI
...
Closes #15957
Move NPC gossip menu options from core script to DB SAI script
for the 3 local Flight Path NPCs in Wyrmrest Temple:
- 26443, Tariolstrasz (Steward of Wyrmrest Temple)
- 26949, Torastrasza (Majordomo to the Ruling Council)
- 27575, Lord Afrasastrasz (Commander of Wyrmrest Temple Defenses)
Additional positive effect: the NPCs are now using verified Blizzlike text in their gossip.
Extra credits: @velinath for relevant background information in the issue,
@Helias & @ShinDarth for their excellent Keira2 web-based database editor.
2016-01-02 22:50:18 +01:00
treeston
b6ed3d3fc2
Merge pull request #16126 from velinath/taxi-to-sai
2016-01-02 17:39:54 +01:00
Rushor
923a368ac7
Update copyright note for 2016
2016-01-01 12:02:33 +01:00
velinath
be38235306
Adds William Kielor to SAI
2015-12-29 21:00:45 -05:00
Killyana
13e509a622
Script/Creature: Imprisoned Beryl Sorcerer
...
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one
2015-12-30 02:05:24 +01:00
Killyana
79c9af11b9
Creature/script: William Kielar
...
Fix Gossips used for taxi
Closes #16112
2015-12-29 19:23:02 +01:00
treeston
403ff21324
Spells/Penance: If hostile target is not in front, now fails in the initial cast rather than the triggered cast, thus not erroneously causing a cooldown.
2015-12-19 11:32:25 +01:00
jackpoz
e6903fdffa
Merge pull request #15852 from Golrag/icc_boss_aggro
2015-12-15 21:29:10 +01:00
tkrokli
4fbffab5f8
Scripts/Spells: Mine Sweeper achievement
...
Enable achievement 1428, "Mine Sweeper" in SpellScript
by @Re3os / @ccrs / @sirikfoll . based on original script from @Vincent-Michael
Closes #15938
2015-12-15 04:27:17 +01:00
