Aokromes
92523278b2
Core/Misc: Coding standard
2016-07-20 18:45:58 +02:00
Keader
47a89b8dcc
Core/Pet: Fixed pets dont lose auras on join arena ( #17185 )
2016-07-20 18:04:54 +02:00
Aokromes
a65ac56b74
Core/Entities: Ported byte field offset naming from 6.x
2016-07-19 15:08:35 +02:00
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
ariel-
d04d14e34d
Update copyright note for 2016
2016-01-11 23:27:45 -03:00
pete318
6664a3acc3
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
...
(cherry picked from commit b1032ed620 )
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.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/GameObject/GameObject.h
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/Transport/Transport.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Mails/Mail.h
src/server/game/Maps/Map.cpp
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/OutdoorPvP/OutdoorPvP.h
2016-01-11 01:50:53 -03:00
ariel-
b3ea9fbbe5
Map local guids 6.x -> 4.3.4
...
Ported the following commits:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
2016-01-11 01:50:45 -03:00
Rushor
923a368ac7
Update copyright note for 2016
2016-01-01 12:02:33 +01:00
jackpoz
bffaa92633
Core/Quest: Fix issues reported by static analysis
2015-12-06 22:43:15 +01:00
pete318
b1032ed620
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
2015-10-12 23:10:41 +02:00
pete318
dcb7082277
Map local guids 6.x -> 3.3.35:
...
Implemented:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
* This adds separate (per map) guid sequences depending on object type
* Ported map object container from cmangos/mangos-wotlk@a2d396e
* Added type container visitor for TypeUnorderedMapContainer
* Implemented helper function to erase unique pairs from multimap containers
* Moved object storage of all objects except players and transports to map level
* Added containers linking database spawn id with creature/gameobject in world
* Renamed DBTableGuid to spawnId
* Added a separate spawn id sequence generator for creatures and gameobjects - this will be used in db tables
* Moved building SMSG_UPDATE_OBJECT - updatefields changes broadcast to map update
* Added new function to return but not increment guid
* Adjusted .debug loadcells to show low guid in map before/after load
* Added debug messages for creature spawn/destroy, for map guid debugging
* Store all Gameobjects and Creatures added to OutdoorPvP, so the callback script can be removed when OutdoorPvP instance is destroyed.
2015-09-22 21:33:57 +02:00
Carbenium
86eb651757
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
sql/updates/world/2015_07_14_00_world.sql
sql/updates/world/2015_07_14_01_world_335.sql
sql/updates/world/2015_07_19_00_world_2015_07_18_04.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_05_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/collision/Management/MMapManager.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/Utilities/Util.cpp
2015-07-26 16:52:35 +02:00
DDuarte
d12fec67f2
Core/Misc: Add a few consts to methods
...
(cherry picked from commit 7d9843c380cf00f38ad0c5bc75fd387e50ee11da)
Conflicts:
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/game/AI/SmartScripts/SmartAI.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Instances/InstanceSaveMgr.h
src/server/game/Support/SupportMgr.h
2015-07-24 12:02:57 +01:00
Shauren
b4adf3f5dd
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
...
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)
Conflicts:
cmake/compiler/msvc/settings.cmake
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Garrison/Garrison.cpp
src/server/game/Garrison/GarrisonMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/PartyPackets.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellScript.cpp
src/server/scripts/Commands/cs_list.cpp
2015-07-24 11:51:48 +01:00
Carbenium
6dfaec3d97
Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4
...
Conflicts:
.gitattributes
CONTRIBUTING.md
sql/updates/world/2015_05_11_04_world.sql
sql/updates/world/2015_05_27_00_world.sql
sql/updates/world/2015_05_27_01_world.sql
sql/updates/world/2015_06_06_01_world_335.sql
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_item.cpp
src/server/scripts/Spells/spell_rogue.cpp
2015-07-22 02:09:32 +02:00
Carbenium
224c7dc6ae
Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_04_04_00_world.sql
sql/updates/world/2015_04_04_01_world.sql
sql/updates/world/2015_04_05_06_world_335.sql
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.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/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_account.cpp
src/tools/map_extractor/System.cpp
src/tools/vmap4_extractor/adtfile.cpp
2015-07-22 00:54:34 +02:00
Carbenium
17bed260e3
Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_14_00_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
2015-07-21 23:27:27 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
ariel-
e707905764
Port commit 56186319bdd41dd26b6cc14f84e6e41eef5d953b (6.x branch)
...
Core/Spells: Cooldown updates
Updates #14418
2015-04-13 12:13:46 -03:00
leak
7010671931
Core/Misc: Remove unused headers
2015-03-30 17:16:50 +02:00
click
a31bc08e44
Core: Pet.cpp - INFO -> DEBUG level notifications...
2015-03-08 06:12:01 +01:00
Vincent-Michael
f3e86d3e68
Update copyright note for 2015
...
Happy new year
Conflicts:
src/server/bnetserver/Authentication/AuthCodes.h
src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
src/server/bnetserver/Packets/AchievementPackets.h
src/server/bnetserver/Packets/AuthenticationPackets.cpp
src/server/bnetserver/Packets/AuthenticationPackets.h
src/server/bnetserver/Packets/BitStream.cpp
src/server/bnetserver/Packets/BitStream.h
src/server/bnetserver/Packets/CachePackets.cpp
src/server/bnetserver/Packets/CachePackets.h
src/server/bnetserver/Packets/ChatPackets.h
src/server/bnetserver/Packets/ConnectionPackets.cpp
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/bnetserver/Packets/FriendsPackets.cpp
src/server/bnetserver/Packets/FriendsPackets.h
src/server/bnetserver/Packets/PacketManager.cpp
src/server/bnetserver/Packets/PacketManager.h
src/server/bnetserver/Packets/Packets.h
src/server/bnetserver/Packets/PacketsBase.cpp
src/server/bnetserver/Packets/PacketsBase.h
src/server/bnetserver/Packets/PresencePackets.cpp
src/server/bnetserver/Packets/PresencePackets.h
src/server/bnetserver/Packets/ProfilePackets.h
src/server/bnetserver/Packets/SupportPackets.h
src/server/bnetserver/Packets/WoWRealmPackets.cpp
src/server/bnetserver/Packets/WoWRealmPackets.h
src/server/bnetserver/Realms/RealmList.cpp
src/server/bnetserver/Realms/WorldListener.cpp
src/server/bnetserver/Realms/WorldListener.h
src/server/bnetserver/Server/ComponentManager.cpp
src/server/bnetserver/Server/ComponentManager.h
src/server/bnetserver/Server/ModuleManager.cpp
src/server/bnetserver/Server/ModuleManager.h
src/server/bnetserver/Server/Session.cpp
src/server/bnetserver/Server/Session.h
src/server/bnetserver/Server/SessionManager.cpp
src/server/bnetserver/Server/SessionManager.h
src/server/game/Accounts/BattlenetAccountMgr.cpp
src/server/game/Accounts/BattlenetAccountMgr.h
src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
src/server/game/Entities/AreaTrigger/AreaTrigger.h
src/server/game/Entities/Item/ItemTemplate.cpp
src/server/game/Guilds/GuildFinderMgr.cpp
src/server/game/Guilds/GuildFinderMgr.h
src/server/game/Handlers/GuildFinderHandler.cpp
src/server/game/Handlers/VoidStorageHandler.cpp
src/server/game/Movement/MovementStructures.cpp
src/server/game/Movement/MovementStructures.h
src/server/game/Movement/PathGenerator.cpp
src/server/game/Server/BattlenetServerManager.cpp
src/server/game/Server/BattlenetServerManager.h
src/server/game/Server/Packet.cpp
src/server/game/Server/Packet.h
src/server/game/Server/Packets/AchievementPackets.cpp
src/server/game/Server/Packets/AchievementPackets.h
src/server/game/Server/Packets/AuctionHousePackets.cpp
src/server/game/Server/Packets/AuctionHousePackets.h
src/server/game/Server/Packets/AuthenticationPackets.cpp
src/server/game/Server/Packets/AuthenticationPackets.h
src/server/game/Server/Packets/BattlegroundPackets.cpp
src/server/game/Server/Packets/BattlegroundPackets.h
src/server/game/Server/Packets/ChannelPackets.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/CharacterPackets.cpp
src/server/game/Server/Packets/CharacterPackets.h
src/server/game/Server/Packets/ChatPackets.cpp
src/server/game/Server/Packets/ChatPackets.h
src/server/game/Server/Packets/ClientConfigPackets.cpp
src/server/game/Server/Packets/ClientConfigPackets.h
src/server/game/Server/Packets/CombatLogPackets.cpp
src/server/game/Server/Packets/CombatLogPackets.h
src/server/game/Server/Packets/CombatPackets.cpp
src/server/game/Server/Packets/CombatPackets.h
src/server/game/Server/Packets/EquipmentSetPackets.cpp
src/server/game/Server/Packets/EquipmentSetPackets.h
src/server/game/Server/Packets/GameObjectPackets.cpp
src/server/game/Server/Packets/GameObjectPackets.h
src/server/game/Server/Packets/GuildPackets.cpp
src/server/game/Server/Packets/GuildPackets.h
src/server/game/Server/Packets/ItemPackets.cpp
src/server/game/Server/Packets/ItemPackets.h
src/server/game/Server/Packets/LootPackets.h
src/server/game/Server/Packets/MiscPackets.cpp
src/server/game/Server/Packets/MiscPackets.h
src/server/game/Server/Packets/MovementPackets.cpp
src/server/game/Server/Packets/MovementPackets.h
src/server/game/Server/Packets/NPCPackets.cpp
src/server/game/Server/Packets/NPCPackets.h
src/server/game/Server/Packets/QueryPackets.cpp
src/server/game/Server/Packets/QueryPackets.h
src/server/game/Server/Packets/QuestPackets.cpp
src/server/game/Server/Packets/QuestPackets.h
src/server/game/Server/Packets/ReputationPackets.cpp
src/server/game/Server/Packets/ReputationPackets.h
src/server/game/Server/Packets/SpellPackets.cpp
src/server/game/Server/Packets/SpellPackets.h
src/server/game/Server/Packets/SystemPackets.cpp
src/server/game/Server/Packets/SystemPackets.h
src/server/game/Server/Packets/TalentPackets.cpp
src/server/game/Server/Packets/TalentPackets.h
src/server/game/Server/Packets/TradePackets.h
src/server/game/Server/Packets/WorldStatePackets.cpp
src/server/game/Server/Packets/WorldStatePackets.h
src/server/game/Server/WorldSocket.cpp
src/server/ipc/CMakeLists.txt
src/server/ipc/Commands.cpp
src/server/ipc/Commands.h
src/server/ipc/ZMQTask.cpp
src/server/ipc/ZMQTask.h
src/server/ipc/ZmqContext.cpp
src/server/ipc/ZmqContext.h
src/server/ipc/ZmqListener.cpp
src/server/ipc/ZmqListener.h
src/server/ipc/ZmqMux.cpp
src/server/ipc/ZmqMux.h
src/server/ipc/ZmqWorker.cpp
src/server/ipc/ZmqWorker.h
src/server/scripts/Commands/cs_battlenet_account.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.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/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
src/server/scripts/Kalimdor/Firelands/firelands.h
src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.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/Maelstrom/Stonecore/boss_corborus.cpp
src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.h
src/server/shared/Cryptography/Authentication/AuthCrypt.h
src/server/shared/Cryptography/Authentication/PacketCrypt.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
src/server/shared/Cryptography/HmacHash.cpp
src/server/shared/Cryptography/SHA256.cpp
src/server/shared/Cryptography/SHA256.h
src/server/shared/Database/Implementation/HotfixDatabase.cpp
src/server/shared/Database/Implementation/HotfixDatabase.h
src/server/shared/Realm/Realm.cpp
src/server/shared/Realm/Realm.h
src/tools/connection_patcher/CMakeLists.txt
src/tools/connection_patcher/Constants/BinaryTypes.hpp
src/tools/connection_patcher/Helper.cpp
src/tools/connection_patcher/Helper.hpp
src/tools/connection_patcher/Patcher.cpp
src/tools/connection_patcher/Patcher.hpp
src/tools/connection_patcher/Patches/Common.hpp
src/tools/connection_patcher/Patches/Mac.hpp
src/tools/connection_patcher/Patches/Windows.hpp
src/tools/connection_patcher/Patterns/Common.hpp
src/tools/connection_patcher/Patterns/Mac.hpp
src/tools/connection_patcher/Patterns/Windows.hpp
src/tools/connection_patcher/Program.cpp
src/tools/map_extractor/loadlib/DBFilesClientList.h
2015-01-01 00:32:50 +01:00
Rat
5993b946c9
Core/Phases: some cleanup
...
- implemented CopyPhaseFrom(obj)
2014-10-30 13:35:12 +01:00
Subv
44c14799f3
Core/Phases: Removed some of the usages of phasemask in the Pet code.
2014-10-28 11:35:40 -05:00
DDuarte
295a8a8dc1
Core/Spells: Fix structure of a particular SMSG_SPELL_GO used in pet summoning
2014-09-27 22:07:08 +01:00
Shauren
8e288dd673
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlefield/Battlefield.h
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Battlegrounds/ArenaTeam.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Battlegrounds/BattlegroundQueue.h
src/server/game/Battlegrounds/BattlegroundScore.h
src/server/game/Battlegrounds/Zones/BattlegroundAB.h
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
src/server/game/Battlegrounds/Zones/BattlegroundEY.h
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
src/server/game/Battlegrounds/Zones/BattlegroundWS.h
src/server/game/DungeonFinding/LFG.h
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/DungeonFinding/LFGQueue.cpp
src/server/game/DungeonFinding/LFGQueue.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Creature/GossipDef.h
src/server/game/Entities/Creature/TemporarySummon.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Object/ObjectDefines.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/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Globals/ObjectAccessor.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.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/PetHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Handlers/VehicleHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_reset.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_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_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.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_durotar.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/shared/Packets/ByteBuffer.h
2014-09-20 11:05:30 +02:00
Shauren
a0e50ea35f
Core/Entities: Use ObjectGuid class in game project
2014-09-14 16:14:12 +02:00
Shauren
ce67a097bf
Core/Entities: Use new PackedGuid class
2014-09-13 01:12:16 +02:00
Shauren
d0176f985d
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-08-15 20:13:34 +02:00
Vincent-Michael
5b355c57ba
Core/Creature: Fix warning
2014-08-14 16:36:04 +02:00
joschiwald
ccfa82e7d5
Core/Creature: update creature_template and some other small things
...
http://www.trinitycore.org/f/topic/9572-creature-damage/
2014-08-14 16:09:14 +02:00
Shauren
909acdbac3
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSocket.h
src/server/authserver/Server/RealmAcceptor.h
src/server/game/Accounts/AccountMgr.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/DungeonFinding/LFGMgr.h
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
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/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/shared/Cryptography/BigNumber.h
src/server/worldserver/RemoteAccess/RASocket.cpp
src/server/worldserver/worldserver.conf.dist
2014-07-19 03:51:11 +02:00
Shauren
7532864264
Buildsystem/MSVC: Warning fixes
...
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
2014-07-17 15:42:57 +02:00
Vincent-Michael
13ff07f121
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/scripts/Commands/cs_wp.cpp
2014-07-14 21:01:55 +02:00
joschiwald
14bbe3e2e9
Core/Battleground: fixed typo
...
* and fixed some warnings
2014-07-14 20:12:39 +02:00
joschiwald
1088c27562
Core/Battleground: moved some arena related code into a generic arena class
...
* fixed typo in random bg selection, that causes no bg is created if only one bg is enabled
* fixed swapped worldstates in Ring of Valor
2014-07-14 18:31:16 +02:00
Kinzcool
34572492dd
Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2014-06-18 23:25:57 -04:00
Vincent-Michael
fe8e904dea
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
2014-06-17 21:22:45 +02:00
Shauren
d60f959fce
Core/Pets: Fixed pet power regeneration
...
Closes #12292
2014-06-17 17:23:30 +02:00
Subv
48ec2df81f
Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4
...
Put here for peer review.
2014-06-01 22:27:29 -05:00
jackpoz
a4ba54fbdb
Core/NetworkIO: Improve packet spam solution
...
Implement an improved packet Anti-DoS by counting how many times the same opcode has been sent in the last second and applying the policy specified in the configs if the amount of packets exceeds a reasonable amount.
Credits to the original author who decided to share this with TrinityCore team.
2014-05-24 22:34:06 +02:00
Vincent-Michael
65ae868cc8
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Commands/cs_npc.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-04-28 23:00:41 +02:00
joschiwald
84bff76ba0
Core/Misc: remove some obsolete parameters
2014-04-28 20:05:36 +02:00
Vincent-Michael
e4b14b943d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/old/3.3.5a/TDB52_to_TDB53_updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names.sql
sql/updates/world/2013_07_24_00_world_spell_script_names_335.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Groups/Group.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.h
src/server/scripts/Commands/cs_character.cpp
src/server/scripts/Commands/cs_lookup.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/tools/vmap4_extractor/mpq_libmpq04.h
2014-04-05 20:43:05 +02:00
jackpoz
8c44259fae
Core/Misc: Fix some static analysis issues
...
Fix uninitialized values, most of which are false positives, always initialized before being accessed.
Add some asserts and additional NULL checks as sanity checks. Use SpellMgr::EnsureSpellInfo() if the spell id is valid and always supposed to return a valid not-NULL SpellInfo* .
2014-03-27 21:43:59 +01:00
joschiwald
3a40d8a887
Core/Player: delete queststatus (weekly/monthly/seasonal) on deleting character thx @Expecto
...
- also rename some prepared statements
Closes #11658
2014-03-02 00:00:39 +01:00
Shauren
0d51fd55a1
Core/Auras: Implemented SPELL_AURA_MOD_COOLDOWN
...
Closes #9671
2014-02-05 13:00:42 +01:00
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
Vincent_Michael
20004050bc
Update copyright note for 2014.
...
Happy new year.
2014-01-01 00:07:53 +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