Aokromes
719a317a67
Update copyright note for 2017
2017-01-02 07:26:38 +01:00
ariel-
16995799c9
Build: Added 1.62 Boost version to FindBoost
2016-10-03 14:58:55 +02:00
Aokromes
41683c1b7c
Cmake: Limit OpenSSL version to 1.0.x client needs RC4 and 1.1.x removes the support
2016-09-11 16:36:23 +02:00
Aokromes
fb7060992b
Buildsystem/MSVC: Drop support to VS2013
...
Upgrade to VS2015 following the steps explained in the wiki
2016-08-18 14:41:19 +02:00
Naios
b64cddabaf
Build: Throw a fatal error when the SCRIPTS variable isn't a valid option.
...
* Catches issues early that are caused through a wrong configuration.
(cherry picked from commit 2b97b32d81 )
2016-08-10 09:04:13 +02:00
Aokromes
9078085595
Core/Scripts: Split script subdirectories into independent modules
...
* Makes it possible to define the linkage for every module
* Move the ScriptPCH into the root directory
* Changes the SCRIPTS cmake variable to a string type:
-> -DSCRIPTS=0 is -DSCRIPTS="minimal-static" now
(builds commands and spells statically)
-> -DSCRIPTS=1 is -DSCRIPTS="static" now
(builds all modules statically)
-> -DSCRIPTS="dynamic"
(builds all modules dynamically)
-> Also the default value which is provided by the SCRIPTS
variable is overwriteable through the SCRIPTS_COMMANDS,
SCRIPTS_SPELLS... variable.
2016-08-10 05:14:53 +02:00
Aokromes
4905073101
Buildsystem: Initial changes to support building with vs clang toolset
2016-08-10 04:43:29 +02:00
Naios
3d25c14e74
Core/Build: Enable /bigobj for most MSVC builds.
...
* exluding 32 bit when dyynamic linking is disabled.
(cherry picked from commit 183f970055 )
2016-08-10 01:34:43 +02:00
Aokromes
b96f20c0d4
CMake: Remove the workaround for source groups below CMake 2.8.12
...
* Set the default option to hierarchical
* Add a new "hierarchical-folders" option which enables folders inside IDE's.
2016-08-09 23:49:31 +02:00
Vincent-Michael
d9f17a6c22
Build/GCC: Enforce version 4.7.2
...
(cherry picked from commit ede8f0ca0a )
2016-07-20 11:00:26 +02:00
Vincent-Michael
3afec9dc88
Build: Added 1.61 Boost version to FindBoost
...
(cherry picked from commit e43b871137 )
2016-07-20 11:00:13 +02:00
Aokromes
9cf3bdf125
Core/Build: Add the possibility to link libraries dynamically.
...
* makes it possible to access exported singletons from other shared lib's.
* reduces binary size
2016-07-15 20:35:32 +02:00
Aokromes
41fb7d649d
Fix pch run
2016-06-09 07:51:34 +02:00
Naios
071382aac1
CMake: Disable incremental linking in msvc debug builds
...
* Requested by Shauren
2016-06-01 02:49:23 +02:00
Naios
7cc2825399
CMake: Fix detection of AppleClang
...
* Since CMake 3.0 CMAKE_<LANG>_COMPILER_ID is set to "AppleClang"
2016-06-01 02:48:51 +02:00
Aokromes
e6d8d31e1e
DB/Creature: Missing Flightpath gossip Turida Coldwind
...
By tkrokli
2016-05-26 04:25:06 +02:00
Aokromes
460a660d4f
CMake: Use inherited dependencies in common and tools (partial pick, need help on this)
2016-05-23 06:24:26 +02:00
Naios
beade4616a
CMake: Add inherited include directories and definitions to precompiled headers
2016-05-23 05:57:51 +02:00
Aokromes
6564fcffdf
CMake: Provide proper interface targets from dependencies
2016-05-23 05:56:48 +02:00
Shauren
cd7537e1f4
Travis: Fixed git version info output
...
(cherry picked from commit 03917c79cd )
2016-05-12 08:29:21 +02:00
ariel-
65aec5f8f7
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Note: additional hand-picked ports from 6.x to fix build
Conflicts:
sql/updates/world/2016_02_22_00_world.sql
sql/updates/world/2016_02_22_01_world.sql
sql/updates/world/2016_02_22_02_world.sql
sql/updates/world/2016_03_07_00_world.sql
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/game/Accounts/AccountMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Scripting/ScriptLoader.cpp
src/server/game/Scripting/ScriptLoader.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/OutdoorPvP/CMakeLists.txt
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/CMakeLists.txt
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
src/tools/mmaps_generator/CMakeLists.txt
2016-03-11 18:32:07 -03:00
Naios
a974574d6e
CMake: Add the possibility to pass an arbitrary count of targets to add_cxx_pch.
...
* A PCH is still generated for every target which was passed to the macro
* Resolves naming conflicts when using the same PCH header from multiple projects
* Ref #15671
2016-02-22 16:25:54 +01:00
Bernd Lörwald
b53b81d8a6
cmake: use CMAKE_BUILD_TYPE instead of CONFIGURATION as BUILD_DIRECTIVE
...
(cherry picked from commit 06391e5e9d )
2016-02-21 21:55:50 -03:00
ariel-
5195b823ad
Buildsystem: Sync CMake options with current TC
2016-01-11 23:27:42 -03:00
ariel-
5723f54a44
Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used.
2016-01-09 10:06:23 -03:00
Aokromes
6861deaae2
Build/Misc: Clarify the meaning of one setting
2016-01-05 13:11:27 +01:00
Rushor
923a368ac7
Update copyright note for 2016
2016-01-01 12:02:33 +01:00
Vincent-Michael
347373264b
Build: Added 1.60 Boost version to FindBoost
2015-12-25 17:09:39 +01:00
Shauren
11b3a60900
Buildsystem: Fixed building on windows 10 with cmake 3.4
...
(cherry picked from commit b5fbf773a5 )
2015-11-12 17:55:04 +01:00
Shauren
1de03cf107
Core/Players: Implemented serverside validation of reserved/profane names
...
Closes #15357
New library dependency: Boost.Regex
(cherry picked from commit b564c10b13 )
2015-10-31 17:27:45 +01:00
Naios
5736deb854
Core/Build: Never overwrite the msvc cxx flags in the cache
...
* Setting all compiler flags in the cache led to circular bloating of
msvc cxx parameters (was visible in console) which caused MSVC to
rebuild the whole solution even on a small CMake change.
It's not neccessary anyway to set the cxx parameters to the cache
to take effect.
* I'm not sure if the workarround is still needed for MSVC 12+.
* Cleaning the CMake cache is recommended!
* ref #15671
(cherry picked from commit 0946fcf2aa )
2015-10-29 18:56:24 +01:00
Shauren
12f5c766c9
Buildsystem/MSVC: Added missed change
...
(cherry picked from commit 7732ad5153 )
2015-09-27 12:24:11 +02:00
Shauren
eac6f22c95
Buildsystem/MSVC: Enabled /Zc:throwingNew for Visual Studio 2015 builds
...
More info here: http://blogs.msdn.com/b/vcblog/archive/2015/08/06/new-in-vs-2015-zc-throwingnew.aspx
Closes #15230
(cherry picked from commit dcb1990e93 )
2015-09-27 12:23:56 +02:00
Carbenium
221f1405b6
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
sql/updates/world/2015_08_29_00_world.sql
sql/updates/world/2015_08_29_01_world.sql
sql/updates/world/2015_08_30_00_world.sql
sql/updates/world/2015_08_31_01_world.sql
sql/updates/world/2015_09_02_00_world.sql
sql/updates/world/2015_09_02_01_world.sql
sql/updates/world/2015_09_02_04_world.sql
sql/updates/world/2015_09_03_00_world.sql
sql/updates/world/2015_09_03_01_world.sql
sql/updates/world/2015_09_03_02_world.sql
sql/updates/world/2015_09_03_03_world.sql
sql/updates/world/2015_09_03_04_world.sql
sql/updates/world/2015_09_03_06_world.sql
sql/updates/world/2015_09_03_07_world.sql
sql/updates/world/2015_09_03_08_world.sql
sql/updates/world/2015_09_03_09_world.sql
sql/updates/world/2015_09_03_10_world.sql
sql/updates/world/2015_09_03_11_world.sql
sql/updates/world/2015_09_04_00_world.sql
sql/updates/world/2015_09_04_01_world.sql
sql/updates/world/2015_09_04_02_world.sql
sql/updates/world/2015_09_04_03_world.sql
sql/updates/world/2015_09_07_00_world.sql
sql/updates/world/2015_09_07_01_world.sql
sql/updates/world/2015_09_07_02_world.sql
sql/updates/world/2015_09_07_03_world.sql
sql/updates/world/2015_09_07_04_world.sql
sql/updates/world/2015_09_07_05_world.sql
sql/updates/world/2015_09_08_00_world.sql
src/common/Collision/Management/MMapManager.cpp
src/common/Cryptography/Authentication/AuthCrypt.cpp
src/common/Cryptography/Authentication/AuthCrypt.h
src/common/Cryptography/HMACSHA1.cpp
src/common/Cryptography/HMACSHA1.h
src/server/CMakeLists.txt
src/server/collision/CMakeLists.txt
src/server/game/CMakeLists.txt
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/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.cpp
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_cheat.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
2015-09-15 20:42:34 +02:00
Aokromes
abc09b9f9e
Build/Misc: Detect boost 1.59
2015-08-29 21:46:17 +02:00
StormBytePP
94f69fb1bc
Core/Build: Removed obsolete SystemConfig.h and made genrev be part of shared library, which allows cache hits to happen more likely
2015-08-16 17:15:38 +02:00
DDuarte
fa6a83b270
Build: Add 1.59 Boost version to FindBoost
2015-08-15 17:54:18 +01:00
jackpoz
ca940548bf
Buildsystem: Fix Boost not found targeting VS2015 with pre-built binaries
...
Fix Boost libraries not being found by CMake when targeting Visual Studio 2015 with Boost installed using the binaries.
Fixes #15277
2015-08-14 20:23:34 +02:00
Carbenium
99ab531e76
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/updates/world/2015_07_29_00_world.sql
sql/updates/world/2015_07_29_01_world.sql
sql/updates/world/2015_08_01_00_world.sql
src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_pet.cpp
2015-08-12 21:05:39 +02:00
DDuarte
bc4baa4e05
Build/CMake: Partially revert recent changes to FindMySQL.cmake
...
Looking for folders like ".../MySQL/*/include" matches the MySQL Connector C libs which caused some problems.
Related #15072 , #15068
P.S ".../MySQL/MySQL Server*/include" doesn't work
(cherry picked from commit e2fb3bbd46 )
2015-07-27 01:13:38 +01: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
Shauren
f03f5cc1f2
Buildsystem/MSVC: Enabled /bigobj for all x64 build types
...
(cherry picked from commit 52127197ec )
2015-07-25 16:42:46 +01:00
Shauren
b4adf3f5dd
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
...
(cherry picked from commit a22e4e121a )
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
293658fb13
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
.gitattributes
dep/PackageList.txt
sql/base/characters_database.sql
sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
sql/updates/world/2015_07_01_03_world_335.sql
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Miscellaneous/Language.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2015-07-22 02:26:46 +02:00
Carbenium
86c34de614
Merge commit '718c238524e5d9bc4d43c56c4870c78af794f520' into 4.3.4
...
Conflicts:
dep/PackageList.txt
dep/libmpq/AUTHORS
dep/libmpq/FAQ
dep/libmpq/README
dep/libmpq/THANKS
dep/libmpq/bindings/d/mpq.d
dep/libmpq/bindings/python/mpq.py
dep/libmpq/configure.ac
dep/libmpq/debian/control
dep/libmpq/debian/copyright
dep/libmpq/doc/man1/libmpq-config.1
dep/libmpq/doc/man3/Makefile.am
dep/libmpq/doc/man3/libmpq.3
dep/libmpq/doc/man3/libmpq__archive_close.3
dep/libmpq/doc/man3/libmpq__archive_files.3
dep/libmpq/doc/man3/libmpq__archive_offset.3
dep/libmpq/doc/man3/libmpq__archive_open.3
dep/libmpq/doc/man3/libmpq__archive_size_packed.3
dep/libmpq/doc/man3/libmpq__archive_size_unpacked.3
dep/libmpq/doc/man3/libmpq__archive_version.3
dep/libmpq/doc/man3/libmpq__block_close_offset.3
dep/libmpq/doc/man3/libmpq__block_open_offset.3
dep/libmpq/doc/man3/libmpq__block_read.3
dep/libmpq/doc/man3/libmpq__block_size_unpacked.3
dep/libmpq/doc/man3/libmpq__file_blocks.3
dep/libmpq/doc/man3/libmpq__file_compressed.3
dep/libmpq/doc/man3/libmpq__file_encrypted.3
dep/libmpq/doc/man3/libmpq__file_imploded.3
dep/libmpq/doc/man3/libmpq__file_number.3
dep/libmpq/doc/man3/libmpq__file_offset.3
dep/libmpq/doc/man3/libmpq__file_read.3
dep/libmpq/doc/man3/libmpq__file_size_packed.3
dep/libmpq/doc/man3/libmpq__file_size_unpacked.3
dep/libmpq/doc/man3/libmpq__strerror.3
dep/libmpq/doc/man3/libmpq__version.3
dep/libmpq/libmpq/Makefile.am
dep/libmpq/libmpq/common.c
dep/libmpq/libmpq/common.h
dep/libmpq/libmpq/explode.c
dep/libmpq/libmpq/explode.h
dep/libmpq/libmpq/extract.c
dep/libmpq/libmpq/extract.h
dep/libmpq/libmpq/huffman.c
dep/libmpq/libmpq/huffman.h
dep/libmpq/libmpq/mpq-internal.h
dep/libmpq/libmpq/mpq.c
dep/libmpq/libmpq/mpq.h
dep/libmpq/libmpq/pack_begin.h
dep/libmpq/libmpq/pack_end.h
dep/libmpq/libmpq/platform.h
dep/libmpq/libmpq/wave.c
dep/libmpq/libmpq/wave.h
dep/libmpq/tools/crypt_buf_gen.c
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
2015-07-22 02:13:10 +02: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
82ea8da720
Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4
...
Conflicts:
.travis.yml
README.md
sql/updates/world/2015_04_18_00_world.sql
sql/updates/world/2015_04_18_05_world_335.sql
sql/updates/world/2015_04_26_03_world_335.sql
sql/updates/world/2015_05_09_00_world_335.sql
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/SpellInfo.cpp
2015-07-22 01:33:48 +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
fd0ef7bfab
Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
...
Conflicts:
.travis.yml
cmake/macros/ConfigureBoost.cmake
sql/base/auth_database.sql
sql/base/characters_database.sql
sql/base/dev/world_database.sql
sql/updates/world/2015_03_21_00_world.sql
src/server/game/Miscellaneous/Language.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/worldserver/Main.cpp
2015-07-22 00:26:09 +02:00
Carbenium
e44401c292
CRLF -> LF
2015-07-21 23:39:19 +02:00