Merge commit 'bd99ddbc799772d8c6de214738717ea67d2f0433' into 400

[newsbot]

автор: VladimirMangos


<pre>m configure.ac
m contrib/vmap_assembler/CMakeLists.txt
m contrib/vmap_assembler/VC100/vmap_assembler.vcxproj
m contrib/vmap_assembler/VC80/vmap_assembler.vcproj
m contrib/vmap_assembler/VC90/vmap_assembler.vcproj
+ contrib/vmap_extractor_v3/win/VC80/vmapExtractor3.vcproj
+ contrib/vmap_extractor_v3/win/vmapExtractor3_VC80.sln
+ dep/libmpq/win/VC80/libmpq.vcproj
+ dep/libmpq/win/libmpq_VC80.sln
m sql/characters.sql
m sql/mangos.sql
m sql/mangos_spell_check.sql
m sql/tools/characters_item_duplicates_remove.sql
+ sql/updates/10742_01_mangos_spell_bonus_data.sql
+ sql/updates/10743_01_mangos_spell_chain.sql
+ sql/updates/10743_02_mangos_spell_bonus_data.sql
+ sql/updates/10746_01_mangos_mangos_string.sql
+ sql/updates/10749_01_mangos_mangos_string.sql
+ sql/updates/10762_01_mangos_spell_proc_event.sql
+ sql/updates/10764_01_mangos_spell_proc_event.sql
+ sql/updates/10786_01_mangos_spell_proc_item_enchant.sql
+ sql/updates/10786_02_mangos_spell_proc_event.sql
+ sql/updates/10788_01_mangos_creature_addon.sql
+ sql/updates/10788_02_mangos_creature_template_addon.sql
+ sql/updates/10835_01_mangos_spell_proc_event.sql
m sql/updates/Makefile.am
m src/bindings/universal/ScriptMgr.h
m src/framework/GameSystem/NGrid.h
m src/framework/Policies/ThreadingModel.h
m src/game/AchievementMgr.cpp
m src/game/AchievementMgr.h
m src/game/ArenaTeamHandler.cpp
m src/game/AuctionHouseHandler.cpp
m src/game/AuctionHouseMgr.cpp
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/Channel.cpp
m src/game/ChannelMgr.cpp
m src/game/ChannelMgr.h
m src/game/CharacterHandler.cpp
m src/game/Chat.cpp
m src/game/Chat.h
m src/game/ChatHandler.cpp
m src/game/ConfusedMovementGenerator.cpp
m src/game/Corpse.cpp
m src/game/Corpse.h
m src/game/Creature.cpp
m src/game/Creature.h
m src/game/CreatureAI.h
m src/game/CreatureEventAI.cpp
m src/game/CreatureEventAIMgr.cpp
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/DestinationHolderImp.h
m src/game/DynamicObject.cpp
m src/game/DynamicObject.h
m src/game/FleeingMovementGenerator.cpp
m src/game/GMTicketHandler.cpp
m src/game/GMTicketMgr.cpp
m src/game/GMTicketMgr.h
m src/game/GameEventMgr.cpp
m src/game/GameObject.cpp
m src/game/GameObject.h
m src/game/GridMap.cpp
m src/game/GridMap.h
m src/game/GridNotifiers.cpp
m src/game/Group.cpp
m src/game/GroupHandler.cpp
m src/game/Guild.cpp
m src/game/GuildHandler.cpp
m src/game/HomeMovementGenerator.cpp
m src/game/InstanceSaveMgr.cpp
m src/game/Item.cpp
m src/game/Item.h
m src/game/ItemHandler.cpp
m src/game/Level1.cpp
m src/game/Level2.cpp
m src/game/Level3.cpp
m src/game/LootHandler.cpp
m src/game/Mail.cpp
m src/game/Mail.h
m src/game/Makefile.am
m src/game/Map.cpp
m src/game/Map.h
- src/game/MapInstanced.cpp
- src/game/MapInstanced.h
m src/game/MapManager.cpp
m src/game/MapManager.h
m src/game/MiscHandler.cpp
m src/game/MotionMaster.cpp
m src/game/MovementHandler.cpp
m src/game/NPCHandler.cpp
m src/game/Object.cpp
m src/game/Object.h
m src/game/ObjectAccessor.cpp
m src/game/ObjectAccessor.h
m src/game/ObjectGuid.h
m src/game/ObjectMgr.cpp
m src/game/ObjectMgr.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/PoolManager.cpp
m src/game/QueryHandler.cpp
m src/game/RandomMovementGenerator.cpp
m src/game/ReputationMgr.cpp
m src/game/ReputationMgr.h
+ src/game/SQLStorages.cpp
+ src/game/SQLStorages.h
m src/game/SharedDefines.h
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/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/Vehicle.cpp
m src/game/Vehicle.h
m src/game/WaypointManager.cpp
m src/game/WaypointMovementGenerator.cpp
m src/game/World.cpp
m src/game/World.h
m src/game/WorldSession.cpp
m src/game/WorldSession.h
m src/game/debugcmds.cpp
m src/game/pchdef.h
m src/game/vmap/BIH.cpp
m src/game/vmap/BIH.h
m src/game/vmap/IVMapManager.h
m src/game/vmap/Makefile.am
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/CliRunnable.cpp
m src/mangosd/CliRunnable.h
m src/mangosd/Makefile.am
m src/mangosd/WorldRunnable.h
m src/realmd/RealmList.cpp
m src/realmd/RealmList.h
m src/shared/Common.h
m src/shared/Database/Database.cpp
m src/shared/Database/DatabasePostgre.cpp
m src/shared/Database/Field.h
m src/shared/Database/QueryResult.h
m src/shared/Database/QueryResultMysql.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/SqlOperations.cpp
m src/shared/Makefile.am
m src/shared/revision_nr.h
m src/shared/revision_sql.h
m win/VC100/game.vcxproj
m win/VC100/game.vcxproj.filters
m win/VC100/shared.vcxproj
m win/VC100/shared.vcxproj.filters
m win/VC100/tbb.vcxproj
m win/VC100/tbbmalloc.vcxproj
+ win/VC80/bzip2.vcproj
m win/VC80/game.vcproj
m win/VC80/mangosd.vcproj
m win/VC80/shared.vcproj
m win/VC90/game.vcproj
m win/VC90/shared.vcproj
m win/mangosdVC100.sln
m win/mangosdVC80.sln
m win/mangosdVC90.sln
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge commit 'bd99ddbc799772d8c6de214738717ea67d2f0433' into 400</pre>




Дальше...