Merge commit 'f7173d6fc39e1b4e303bab380ecd0f295526d18f' - [11900] into 400

[newsbot]

Автор: Xfurry


<pre>m CMakeLists.txt
m NEWS
m README
m cmake/ImportACE.cmake
m cmake/ImportTBB.cmake
m contrib/extractor/CMakeLists.txt
+ contrib/extractor/libmpq/CMakeLists.txt
m contrib/extractor/loadlib/CMakeLists.txt
m contrib/git_id/git_id.cpp
m contrib/mysql_to_pgsql/src/defines.h
m contrib/mysql_to_pgsql/src/main.cpp
m contrib/soap/example.php
m contrib/vmap_assembler/CMakeLists.txt
m contrib/vmap_assembler/vmap_assembler.cpp
m contrib/vmap_extractor_v3/CMakeLists.txt
m contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt
m contrib/vmap_extractor_v3/vmapextract/adtfile.cpp
m contrib/vmap_extractor_v3/vmapextract/adtfile.h
m contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp
m contrib/vmap_extractor_v3/vmapextract/dbcfile.h
m contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
m contrib/vmap_extractor_v3/vmapextract/model.cpp
m contrib/vmap_extractor_v3/vmapextract/model.h
m contrib/vmap_extractor_v3/vmapextract/modelheaders.h
m contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp
m contrib/vmap_extractor_v3/vmapextract/vmapexport.h
m contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp
m contrib/vmap_extractor_v3/vmapextract/wdtfile.h
m contrib/vmap_extractor_v3/vmapextract/wmo.cpp
m contrib/vmap_extractor_v3/vmapextract/wmo.h
m dep/ACE_wrappers/CMakeLists.txt
m dep/CMakeLists.txt
m dep/src/CMakeLists.txt
m dep/src/g3dlite/CMakeLists.txt
m dep/src/gsoap/CMakeLists.txt
m dep/src/zlib/CMakeLists.txt
m dep/tbb/CMakeLists.txt
m doc/EventAI.txt
m doc/script_commands.txt
m sql/mangos.sql
m sql/tools/README
+ sql/updates/11851_01_mangos_string.sql
+ sql/updates/11852_01_mangos_gossip_menu.sql
+ sql/updates/11876_01_mangos_creature_linking_template.sql
+ sql/updates/11885_01_mangos_spell_proc_event.sql
m sql/updates/README
m src/CMakeLists.txt
m src/bindings/CMakeLists.txt
m src/bindings/universal/CMakeLists.txt
m src/bindings/universal/ScriptMgr.cpp
m src/bindings/universal/ScriptMgr.h
m src/bindings/universal/Scripts/sc_default.cpp
m src/bindings/universal/Scripts/sc_defines.cpp
m src/bindings/universal/Scripts/sc_defines.h
m src/bindings/universal/config.h
m src/bindings/universal/system.cpp
m src/framework/CMakeLists.txt
m src/framework/Dynamic/FactoryHolder.h
m src/framework/Dynamic/ObjectRegistry.h
m src/framework/GameSystem/Grid.h
m src/framework/GameSystem/GridLoader.h
m src/framework/GameSystem/GridRefManager.h
m src/framework/GameSystem/GridReference.h
m src/framework/GameSystem/NGrid.h
m src/framework/GameSystem/TypeContainer.h
m src/framework/GameSystem/TypeContainerFunctions.h
m src/framework/GameSystem/TypeContainerFunctionsPtr.h
m src/framework/GameSystem/TypeContainerVisitor.h
m src/framework/Platform/CompilerDefs.h
m src/framework/Platform/Define.h
m src/framework/Policies/CreationPolicy.h
m src/framework/Policies/MemoryManagement.cpp
m src/framework/Policies/ObjectLifeTime.cpp
m src/framework/Policies/ObjectLifeTime.h
m src/framework/Policies/Singleton.h
m src/framework/Policies/SingletonImp.h
m src/framework/Policies/ThreadingModel.h
m src/framework/Utilities/ByteConverter.h
m src/framework/Utilities/Callback.h
m src/framework/Utilities/EventProcessor.cpp
m src/framework/Utilities/EventProcessor.h
m src/framework/Utilities/LinkedList.h
m src/framework/Utilities/LinkedReference/RefManager.h
m src/framework/Utilities/LinkedReference/Reference.h
m src/framework/Utilities/TypeList.h
m src/framework/Utilities/UnorderedMapSet.h
m src/game/AccountMgr.cpp
m src/game/AccountMgr.h
m src/game/AchievementMgr.cpp
m src/game/AchievementMgr.h
m src/game/AggressorAI.cpp
m src/game/AggressorAI.h
m src/game/ArenaTeam.cpp
m src/game/ArenaTeam.h
m src/game/ArenaTeamHandler.cpp
m src/game/AuctionHouseHandler.cpp
m src/game/AuctionHouseMgr.cpp
m src/game/AuctionHouseMgr.h
m src/game/Bag.cpp
m src/game/Bag.h
m src/game/BattleGround.cpp
m src/game/BattleGround.h
m src/game/BattleGroundAA.cpp
m src/game/BattleGroundAA.h
m src/game/BattleGroundAB.cpp
m src/game/BattleGroundAB.h
m src/game/BattleGroundAV.cpp
m src/game/BattleGroundAV.h
m src/game/BattleGroundBE.cpp
m src/game/BattleGroundBE.h
m src/game/BattleGroundDS.cpp
m src/game/BattleGroundDS.h
m src/game/BattleGroundEY.cpp
m src/game/BattleGroundEY.h
m src/game/BattleGroundHandler.cpp
m src/game/BattleGroundIC.cpp
m src/game/BattleGroundIC.h
m src/game/BattleGroundMgr.cpp
m src/game/BattleGroundMgr.h
m src/game/BattleGroundNA.cpp
m src/game/BattleGroundNA.h
m src/game/BattleGroundRB.cpp
m src/game/BattleGroundRB.h
m src/game/BattleGroundRL.cpp
m src/game/BattleGroundRL.h
m src/game/BattleGroundRV.cpp
m src/game/BattleGroundRV.h
m src/game/BattleGroundSA.cpp
m src/game/BattleGroundSA.h
m src/game/BattleGroundWS.cpp
m src/game/BattleGroundWS.h
m src/game/CMakeLists.txt
m src/game/Calendar.cpp
m src/game/Calendar.h
m src/game/CalendarHandler.cpp
m src/game/Camera.cpp
m src/game/Camera.h
m src/game/Cell.h
m src/game/CellImpl.h
m src/game/Channel.cpp
m src/game/Channel.h
m src/game/ChannelHandler.cpp
m src/game/ChannelMgr.cpp
m src/game/ChannelMgr.h
m src/game/CharacterDatabaseCleaner.cpp
m src/game/CharacterDatabaseCleaner.h
m src/game/CharacterHandler.cpp
m src/game/Chat.cpp
m src/game/Chat.h
m src/game/ChatHandler.cpp
m src/game/CombatHandler.cpp
m src/game/ConfusedMovementGenerator.cpp
m src/game/ConfusedMovementGenerator.h
m src/game/Corpse.cpp
m src/game/Corpse.h
m src/game/Creature.cpp
m src/game/Creature.h
m src/game/CreatureAI.cpp
m src/game/CreatureAI.h
m src/game/CreatureAIImpl.h
m src/game/CreatureAIRegistry.cpp
m src/game/CreatureAIRegistry.h
m src/game/CreatureAISelector.cpp
m src/game/CreatureAISelector.h
m src/game/CreatureEventAI.cpp
m src/game/CreatureEventAI.h
m src/game/CreatureEventAIMgr.cpp
m src/game/CreatureEventAIMgr.h
m src/game/CreatureLinkingMgr.cpp
m src/game/CreatureLinkingMgr.h
m src/game/DBCEnums.h
m src/game/DBCStores.cpp
m src/game/DBCStores.h
m src/game/DBCStructure.h
m src/game/DBCfmt.h
m src/game/DuelHandler.cpp
m src/game/DynamicObject.cpp
m src/game/DynamicObject.h
m src/game/FleeingMovementGenerator.cpp
m src/game/FleeingMovementGenerator.h
m src/game/FollowerRefManager.h
m src/game/FollowerReference.cpp
m src/game/FollowerReference.h
m src/game/Formulas.h
m src/game/GMTicketHandler.cpp
m src/game/GMTicketMgr.cpp
m src/game/GMTicketMgr.h
m src/game/GameEventMgr.cpp
m src/game/GameEventMgr.h
m src/game/GameObject.cpp
m src/game/GameObject.h
m src/game/GossipDef.cpp
m src/game/GossipDef.h
m src/game/GridDefines.h
m src/game/GridMap.cpp
m src/game/GridMap.h
m src/game/GridNotifiers.cpp
m src/game/GridNotifiers.h
m src/game/GridNotifiersImpl.h
m src/game/GridStates.cpp
m src/game/GridStates.h
m src/game/Group.cpp
m src/game/Group.h
m src/game/GroupHandler.cpp
m src/game/GroupRefManager.h
m src/game/GroupReference.cpp
m src/game/GroupReference.h
m src/game/GuardAI.cpp
m src/game/GuardAI.h
m src/game/Guild.cpp
m src/game/Guild.h
m src/game/GuildHandler.cpp
m src/game/GuildMgr.cpp
m src/game/GuildMgr.h
m src/game/HomeMovementGenerator.cpp
m src/game/HomeMovementGenerator.h
m src/game/HostileRefManager.cpp
m src/game/HostileRefManager.h
m src/game/IdleMovementGenerator.cpp
m src/game/IdleMovementGenerator.h
m src/game/InstanceData.cpp
m src/game/InstanceData.h
m src/game/Item.cpp
m src/game/Item.h
m src/game/ItemEnchantmentMgr.cpp
m src/game/ItemEnchantmentMgr.h
m src/game/ItemHandler.cpp
m src/game/ItemPrototype.h
m src/game/LFGHandler.cpp
m src/game/Language.h
m src/game/Level0.cpp
m src/game/Level1.cpp
m src/game/Level2.cpp
m src/game/Level3.cpp
m src/game/LootHandler.cpp
m src/game/LootMgr.cpp
m src/game/LootMgr.h
m src/game/Mail.cpp
m src/game/Mail.h
m src/game/MailHandler.cpp
m src/game/Map.cpp
m src/game/Map.h
m src/game/MapManager.cpp
m src/game/MapManager.h
m src/game/MapPersistentStateMgr.cpp
m src/game/MapPersistentStateMgr.h
m src/game/MapRefManager.h
m src/game/MapReference.h
m src/game/MassMailMgr.cpp
m src/game/MassMailMgr.h
m src/game/MiscHandler.cpp
m src/game/MotionMaster.cpp
m src/game/MotionMaster.h
m src/game/MovementGenerator.cpp
m src/game/MovementGenerator.h
m src/game/MovementGeneratorImpl.h
m src/game/MovementHandler.cpp
m src/game/NPCHandler.cpp
m src/game/NPCHandler.h
m src/game/NullCreatureAI.cpp
m src/game/NullCreatureAI.h
m src/game/Object.cpp
m src/game/Object.h
m src/game/ObjectAccessor.cpp
m src/game/ObjectAccessor.h
m src/game/ObjectGridLoader.cpp
m src/game/ObjectGridLoader.h
m src/game/ObjectGuid.cpp
m src/game/ObjectGuid.h
m src/game/ObjectMgr.cpp
m src/game/ObjectMgr.h
m src/game/ObjectPosSelector.cpp
m src/game/ObjectPosSelector.h
m src/game/Path.h
m src/game/Pet.cpp
m src/game/Pet.h
m src/game/PetAI.cpp
m src/game/PetAI.h
m src/game/PetHandler.cpp
m src/game/PetitionsHandler.cpp
m src/game/Player.cpp
m src/game/Player.h
m src/game/PlayerDump.cpp
m src/game/PlayerDump.h
m src/game/PointMovementGenerator.cpp
m src/game/PointMovementGenerator.h
m src/game/PoolManager.cpp
m src/game/PoolManager.h
m src/game/QueryHandler.cpp
m src/game/QuestDef.cpp
m src/game/QuestDef.h
m src/game/QuestHandler.cpp
m src/game/RandomMovementGenerator.cpp
m src/game/RandomMovementGenerator.h
m src/game/ReactorAI.cpp
m src/game/ReactorAI.h
m src/game/ReputationMgr.cpp
m src/game/ReputationMgr.h
m src/game/SQLStorages.cpp
m src/game/SQLStorages.h
m src/game/ScriptMgr.cpp
m src/game/ScriptMgr.h
m src/game/SharedDefines.h
m src/game/SkillDiscovery.cpp
m src/game/SkillDiscovery.h
m src/game/SkillExtraItems.cpp
m src/game/SkillExtraItems.h
m src/game/SkillHandler.cpp
m src/game/SocialMgr.cpp
m src/game/SocialMgr.h
m src/game/Spell.cpp
m src/game/Spell.h
m src/game/SpellAuraDefines.h
m src/game/SpellAuras.cpp
m src/game/SpellAuras.h
m src/game/SpellEffects.cpp
m src/game/SpellHandler.cpp
m src/game/SpellMgr.cpp
m src/game/SpellMgr.h
m src/game/StatSystem.cpp
m src/game/TargetedMovementGenerator.cpp
m src/game/TargetedMovementGenerator.h
m src/game/TaxiHandler.cpp
m src/game/TemporarySummon.cpp
m src/game/TemporarySummon.h
m src/game/ThreatManager.cpp
m src/game/ThreatManager.h
m src/game/Totem.cpp
m src/game/Totem.h
m src/game/TotemAI.cpp
m src/game/TotemAI.h
m src/game/TradeHandler.cpp
m src/game/Transports.cpp
m src/game/Transports.h
m src/game/Unit.cpp
m src/game/Unit.h
m src/game/UnitAuraProcHandler.cpp
m src/game/UnitEvents.h
m src/game/UpdateData.cpp
m src/game/UpdateData.h
m src/game/UpdateFields.h
m src/game/UpdateMask.h
m src/game/Vehicle.cpp
m src/game/Vehicle.h
m src/game/VoiceChatHandler.cpp
m src/game/WaypointManager.cpp
m src/game/WaypointManager.h
m src/game/WaypointMovementGenerator.cpp
m src/game/WaypointMovementGenerator.h
m src/game/Weather.cpp
m src/game/Weather.h
m src/game/World.cpp
m src/game/World.h
m src/game/WorldSession.cpp
m src/game/WorldSession.h
m src/game/WorldSocket.cpp
m src/game/WorldSocket.h
m src/game/WorldSocketMgr.cpp
m src/game/WorldSocketMgr.h
m src/game/debugcmds.cpp
m src/game/movement/MoveSpline.cpp
m src/game/movement/MoveSpline.h
m src/game/movement/MoveSplineFlag.h
m src/game/movement/MoveSplineInit.cpp
m src/game/movement/MoveSplineInit.h
m src/game/movement/MoveSplineInitArgs.h
m src/game/movement/packet_builder.cpp
m src/game/movement/packet_builder.h
m src/game/movement/spline.cpp
m src/game/movement/spline.h
m src/game/movement/spline.impl.h
m src/game/movement/typedefs.h
m src/game/movement/util.cpp
m src/game/vmap/BIH.cpp
m src/game/vmap/BIH.h
m src/game/vmap/IVMapManager.h
m src/game/vmap/MapTree.cpp
m src/game/vmap/MapTree.h
m src/game/vmap/ModelInstance.cpp
m src/game/vmap/ModelInstance.h
m src/game/vmap/TileAssembler.cpp
m src/game/vmap/TileAssembler.h
m src/game/vmap/VMapDefinitions.h
m src/game/vmap/VMapFactory.cpp
m src/game/vmap/VMapFactory.h
m src/game/vmap/VMapManager2.cpp
m src/game/vmap/VMapManager2.h
m src/game/vmap/VMapTools.h
m src/game/vmap/WorldModel.cpp
m src/game/vmap/WorldModel.h
m src/mangosd/CMakeLists.txt
m src/mangosd/CliRunnable.cpp
m src/mangosd/CliRunnable.h
m src/mangosd/MaNGOSsoap.cpp
m src/mangosd/MaNGOSsoap.h
m src/mangosd/Main.cpp
m src/mangosd/Master.cpp
m src/mangosd/Master.h
m src/mangosd/RASocket.cpp
m src/mangosd/RASocket.h
m src/mangosd/WorldRunnable.cpp
m src/mangosd/WorldRunnable.h
m src/mangosd/mangosd.conf.dist.in
m src/mangosd/mangosd.rc
m src/realmd/AuthCodes.h
m src/realmd/AuthSocket.cpp
m src/realmd/AuthSocket.h
m src/realmd/BufferedSocket.cpp
m src/realmd/BufferedSocket.h
m src/realmd/CMakeLists.txt
m src/realmd/Main.cpp
m src/realmd/PatchHandler.cpp
m src/realmd/PatchHandler.h
m src/realmd/RealmList.cpp
m src/realmd/RealmList.h
m src/realmd/realmd.rc
m src/shared/Auth/AuthCrypt.cpp
m src/shared/Auth/AuthCrypt.h
m src/shared/Auth/BigNumber.cpp
m src/shared/Auth/BigNumber.h
m src/shared/Auth/HMACSHA1.cpp
m src/shared/Auth/HMACSHA1.h
m src/shared/Auth/SARC4.cpp
m src/shared/Auth/SARC4.h
m src/shared/Auth/Sha1.cpp
m src/shared/Auth/Sha1.h
m src/shared/ByteBuffer.h
m src/shared/CMakeLists.txt
m src/shared/Common.cpp
m src/shared/Common.h
m src/shared/Config/Config.cpp
m src/shared/Config/Config.h
m src/shared/Database/DBCFileLoader.cpp
m src/shared/Database/DBCFileLoader.h
m src/shared/Database/DBCStore.h
m src/shared/Database/Database.cpp
m src/shared/Database/Database.h
m src/shared/Database/DatabaseEnv.h
m src/shared/Database/DatabaseImpl.h
m src/shared/Database/DatabaseMysql.cpp
m src/shared/Database/DatabaseMysql.h
m src/shared/Database/DatabasePostgre.cpp
m src/shared/Database/DatabasePostgre.h
m src/shared/Database/Field.cpp
m src/shared/Database/Field.h
m src/shared/Database/MySQLDelayThread.h
m src/shared/Database/PGSQLDelayThread.h
m src/shared/Database/QueryResult.h
m src/shared/Database/QueryResultMysql.cpp
m src/shared/Database/QueryResultMysql.h
m src/shared/Database/QueryResultPostgre.cpp
m src/shared/Database/QueryResultPostgre.h
m src/shared/Database/SQLStorage.cpp
m src/shared/Database/SQLStorage.h
m src/shared/Database/SQLStorageImpl.h
m src/shared/Database/SqlDelayThread.cpp
m src/shared/Database/SqlDelayThread.h
m src/shared/Database/SqlOperations.cpp
m src/shared/Database/SqlOperations.h
m src/shared/Database/SqlPreparedStatement.cpp
m src/shared/Database/SqlPreparedStatement.h
m src/shared/Errors.h
m src/shared/LockedQueue.h
m src/shared/Log.cpp
m src/shared/Log.h
m src/shared/PosixDaemon.cpp
m src/shared/PosixDaemon.h
m src/shared/ProgressBar.cpp
m src/shared/ProgressBar.h
m src/shared/ServiceWin32.cpp
m src/shared/ServiceWin32.h
m src/shared/SystemConfig.h.in
m src/shared/Threading.cpp
m src/shared/Threading.h
m src/shared/Timer.h
m src/shared/Util.cpp
m src/shared/Util.h
m src/shared/WorldPacket.h
m src/shared/revision_nr.h
m src/shared/revision_sql.h
m src/tools/genrevision/genrevision.cpp
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge commit 'f7173d6fc39e1b4e303bab380ecd0f295526d18f' - [11900] into 400</pre>


Подробнее...