Merge remote-tracking branch 'origin/master' into 400

[newsbot]

автор: VladimirMangos


<pre>m CMakeLists.txt
m dep/ACE_wrappers/CMakeLists.txt
m dep/ACE_wrappers/ace/ACE_vc8.vcproj
m dep/include/openssl/asn1.h
m dep/include/openssl/dtls1.h
m dep/include/openssl/engine.h
m dep/include/openssl/opensslconf.h
m dep/include/openssl/opensslv.h
m dep/include/openssl/pem.h
m dep/include/openssl/safestack.h
m dep/include/openssl/symhacks.h
m dep/include/openssl/x509.h
m dep/lib/win32_debug/.gitignore
m dep/lib/win32_debug/libeay32.dll
m dep/lib/win32_debug/libeay32.lib
m dep/lib/win32_release/.gitignore
m dep/lib/win32_release/libeay32.dll
m dep/lib/win32_release/libeay32.lib
m dep/lib/x64_Debug/.gitignore
m dep/lib/x64_Debug/libeay32.dll
m dep/lib/x64_Debug/libeay32.lib
m dep/lib/x64_release/.gitignore
m dep/lib/x64_release/libeay32.dll
m dep/lib/x64_release/libeay32.lib
m dep/tbb/CMakeLists.txt
m doc/EventAI.txt
m doc/script_commands.txt
m sql/characters.sql
m sql/mangos.sql
m sql/mangos_spell_check.sql
m sql/postgre_compatibility_addon.sql
m sql/realmd.sql
m sql/updates/0.14/7988_07_characters_characters.sql
m sql/updates/0.15/8589_11_characters_characters.sql
m sql/updates/0.16/09136_07_characters_characters.sql
m sql/updates/0.5/1465_build_realmd_db.sql
m sql/updates/0.7/3655_quest_template.sql
m sql/updates/10156_01_characters_character_aura.sql
m sql/updates/10156_02_characters_pet_aura.sql
m sql/updates/10582_01_mangos_spell_proc_event.sql
m sql/updates/10604_01_mangos_spell_proc_event.sql
+ sql/updates/11299_01_characters_character_aura.sql
+ sql/updates/11299_02_characters_pet_aura.sql
+ sql/updates/11310_01_mangos_mangos_string.sql
+ sql/updates/11312_01_mangos_mangos_string.sql
+ sql/updates/11335_01_mangos_mangos_string.sql
+ sql/updates/11335_02_mangos_mangos_string.sql
+ sql/updates/11337_01_mangos_mangos_string.sql
+ sql/updates/11348_01_mangos_spell_bonus_data.sql
+ sql/updates/11385_01_mangos_creature_template.sql
+ sql/updates/11391_01_characters_auction.sql
m src/game/AchievementMgr.cpp
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/BattleGround.cpp
m src/game/BattleGround.h
m src/game/BattleGroundHandler.cpp
m src/game/BattleGroundMgr.cpp
m src/game/BattleGroundMgr.h
m src/game/CalendarHandler.cpp
m src/game/Camera.h
m src/game/Channel.cpp
m src/game/CharacterHandler.cpp
m src/game/Chat.cpp
m src/game/Chat.h
m src/game/Corpse.cpp
m src/game/Creature.cpp
m src/game/Creature.h
m src/game/CreatureAI.h
m src/game/CreatureEventAI.cpp
m src/game/CreatureEventAI.h
m src/game/DBCStructure.h
m src/game/DBCfmt.h
m src/game/DynamicObject.cpp
m src/game/DynamicObject.h
m src/game/GMTicketHandler.cpp
m src/game/GameEventMgr.cpp
m src/game/GameObject.cpp
m src/game/GameObject.h
m src/game/GridDefines.h
m src/game/GridNotifiersImpl.h
m src/game/Group.cpp
m src/game/GroupHandler.cpp
m src/game/Guild.cpp
m src/game/Guild.h
m src/game/HomeMovementGenerator.cpp
m src/game/HomeMovementGenerator.h
m src/game/Item.cpp
m src/game/Item.h
m src/game/ItemHandler.cpp
m src/game/ItemPrototype.h
m src/game/LFGHandler.cpp
m src/game/Language.h
m src/game/Level2.cpp
m src/game/Level3.cpp
m src/game/LootHandler.cpp
m src/game/Mail.cpp
m src/game/Map.cpp
m src/game/Map.h
m src/game/MapManager.cpp
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/ObjectGridLoader.cpp
m src/game/ObjectGuid.h
m src/game/ObjectMgr.cpp
m src/game/ObjectMgr.h
m src/game/Opcodes.cpp
m src/game/Opcodes.h
m src/game/Pet.cpp
m src/game/Pet.h
m src/game/PetitionsHandler.cpp
m src/game/Player.cpp
m src/game/Player.h
m src/game/PointMovementGenerator.cpp
m src/game/PoolManager.cpp
m src/game/QueryHandler.cpp
m src/game/QuestHandler.cpp
m src/game/RandomMovementGenerator.cpp
m src/game/ReputationMgr.cpp
m src/game/SQLStorages.cpp
m src/game/ScriptMgr.cpp
m src/game/ScriptMgr.h
m src/game/SharedDefines.h
m src/game/Spell.cpp
m src/game/Spell.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/TargetedMovementGenerator.cpp
m src/game/TemporarySummon.cpp
m src/game/Totem.cpp
m src/game/Totem.h
m src/game/Transports.cpp
m src/game/Traveller.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/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/WorldSocket.cpp
m src/game/debugcmds.cpp
m src/game/vmap/BIH.cpp
m src/game/vmap/BIH.h
m src/game/vmap/WorldModel.cpp
m src/mangosd/CMakeLists.txt
m src/mangosd/mangosd.conf.dist.in
m src/realmd/AuthSocket.cpp
m src/realmd/CMakeLists.txt
m src/shared/Database/Field.h
m src/shared/revision_nr.h
m src/shared/revision_sql.h
m win/VC100/ACE_vc10.vcxproj
m win/VC100/shared.vcxproj
m win/VC100/shared.vcxproj.filters
m win/VC80/shared.vcproj
m win/VC90/ACE_vc9.vcproj
m win/VC90/shared.vcproj
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge remote-tracking branch 'origin/master' into 400</pre>




Дальше...