Merge branch 'master' of github.com:mangos-three/server

[newsbot]

Автор: Netcho


<pre>m contrib/extractor/CMakeLists.txt
m contrib/git_id/git_id.cpp
+ contrib/mmap/win/MoveMapGen_VC110.sln
+ contrib/mmap/win/VC110/.gitignore
+ contrib/mmap/win/VC110/MoveMapGen_VC110.vcxproj
+ contrib/mmap/win/VC110/MoveMapGen_VC110.vcxproj.filters
m dep/CMakeLists.txt
m dep/StormLib/CMakeLists.txt
+ dep/recastnavigation/Detour/win/Detour_VC110.sln
+ dep/recastnavigation/Detour/win/VC110/.gitignore
+ dep/recastnavigation/Detour/win/VC110/Detour.vcxproj
+ dep/recastnavigation/Detour/win/VC110/Detour.vcxproj.filters
+ dep/recastnavigation/Recast/win/Recast_VC110.sln
+ dep/recastnavigation/Recast/win/VC110/.gitignore
+ dep/recastnavigation/Recast/win/VC110/Recast.vcxproj
+ dep/recastnavigation/Recast/win/VC110/Recast.vcxproj.filters
m dep/tbb/include/tbb/tbb_config.h
m dep/tbb/include/tbb/tbb_exception.h
m sql/characters.sql
m sql/mangos.sql
+ sql/updates/0023_xxxxx_01_mangos_player_classlevelstats.sql
+ sql/updates/0028_xxxxx_01_characters_character_phase_data.sql
+ sql/updates/0028_xxxxx_02_mangos_quest_phase_maps.sql
+ sql/updates/0028_xxxxx_03_mangos_playercreateinfo.sql
+ sql/updates/0034_xxxxx_01_mangos_playercreateinfo.sql
+ sql/updates/0034_xxxxx_02_mangos_player_levelstats.sql
+ sql/updates/0034_xxxxx_03_mangos_player_classlevelstats.sql
+ sql/updates/0038_xxxxx_01_mangos_player_classlevelstats.sql
+ sql/updates/0040_xxxxx_01_mangos_playercreateinfo.sql
+ sql/updates/0046_xxxxx_01_mangos_player_xp_for_level.sql
+ sql/updates/0065_12087_01_mangos_mangos_string.sql
+ sql/updates/0065_12087_02_mangos_command.sql
m src/game/BattleGroundMgr.cpp
m src/game/Chat.cpp
m src/game/Chat.h
m src/game/ChatHandler.cpp
m src/game/Creature.cpp
m src/game/CreatureAIRegistry.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/Formulas.h
m src/game/GameObject.cpp
m src/game/Guild.cpp
m src/game/Guild.h
m src/game/Level1.cpp
m src/game/Level2.cpp
m src/game/Level3.cpp
m src/game/LootMgr.cpp
m src/game/Map.cpp
m src/game/MapManager.h
m src/game/MapPersistentStateMgr.cpp
m src/game/MiscHandler.cpp
m src/game/MovementHandler.cpp
m src/game/MovementStructures.h
m src/game/NPCHandler.cpp
m src/game/Object.cpp
m src/game/ObjectMgr.cpp
m src/game/ObjectMgr.h
m src/game/Opcodes.cpp
m src/game/Opcodes.h
m src/game/Player.cpp
m src/game/Player.h
m src/game/ScriptMgr.cpp
m src/game/SharedDefines.h
m src/game/Spell.cpp
m src/game/SpellAuras.cpp
m src/game/Transports.cpp
m src/game/Unit.cpp
m src/game/Unit.h
m src/game/UpdateData.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/debugcmds.cpp
m src/game/movement/packet_builder.cpp
m src/game/vmap/WorldModel.cpp
m src/shared/SystemConfig.h.in
m src/shared/Util.cpp
m src/shared/Util.h
m src/shared/revision_nr.h
m src/shared/revision_sql.h
+ win/VC110/.gitignore
+ win/VC110/ACE_vc11.vcxproj
+ win/VC110/ACE_vc11.vcxproj.filters
+ win/VC110/bzip2.vcxproj
+ win/VC110/framework.vcxproj
+ win/VC110/framework.vcxproj.filters
+ win/VC110/g3dlite.vcxproj
+ win/VC110/g3dlite.vcxproj.filters
+ win/VC110/game.vcxproj
+ win/VC110/game.vcxproj.filters
+ win/VC110/genrevision.vcxproj
+ win/VC110/mangosd.vcxproj
+ win/VC110/mangosd.vcxproj.filters
+ win/VC110/realmd.vcxproj
+ win/VC110/script.vcxproj
+ win/VC110/script.vcxproj.filters
+ win/VC110/shared.vcxproj
+ win/VC110/shared.vcxproj.filters
+ win/VC110/tbb.vcxproj
+ win/VC110/tbb.vcxproj.filters
+ win/VC110/tbbmalloc.vcxproj
+ win/VC110/tbbmalloc.vcxproj.filters
+ win/VC110/zlib.vcxproj
+ win/VC110/zlib.vcxproj.filters
+ win/mangosdVC110.sln
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge branch 'master' of github.com:mangos-three/server</pre>


Подробнее... (https://github.com/mangos-three/server/commit/ff20ba21d2c385c9150e30b9cefb273f9e3174a6)