Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity
29,917 Commits 2 Branches 1 Tag
b2ae2653f73fed2b1015d615cd6acb13064da170
Commit Graph
29917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rushor af54aaf6d8 DB/SAI: Update Winterspring 2015-07-24 20:31:52 +02:00
Rushor 3950ea3881 DB/SAI: Update Feralas for 3.3.5 
* closes #15126
* updated by @Killyana
 2015-07-24 19:42:25 +02:00
Killyana 3bfdb548dd DB/Item: Sack of Ulduar Spoils / Large Sack of Ulduar Spoils 
* closes #15059
 2015-07-24 19:20:05 +02:00
Killyana 3c66a88d04 DB/Misc: Fixup evading Creatures 
closes #15094
 2015-07-24 19:17:56 +02:00
Killyana 5330a4c454 DB/Point of Interests: Locales points of interest 
closes #15110
 2015-07-24 19:16:00 +02:00
Killyana a3f6523010 DB/Pages: Locales for page text 
* closes #15105
 2015-07-24 19:14:27 +02:00
Killyana 11d603a408 DB/Misc: Grim Guzzler Area Events 
closes #15138
 2015-07-24 19:09:50 +02:00
tkrokli 785fcdd838 DB/Misc: Stable Master Xon'cha - Flags 
* closes #15117
 2015-07-24 19:07:06 +02:00
Rushor a321f56379 DB/Creature: Add Tabledance for Duokna 2015-07-24 17:36:42 +02:00
Warpten a82e55f684 Scripts/RubySanctum: Halion: Correctly spawn X-shaped flames. 2015-07-24 17:11:30 +02:00
Rushor 20815105a7 DB/SAI: Update Ghostlands + Darkshore 2015-07-24 17:00:07 +02:00
Aokromes 5c2ea73a92 DB/Misc: More 3.3.5a fixes 2015-07-24 15:31:13 +02:00
Vincent-Michael 9f04cbad21 Fix non pch build for Visual Studio 2015 compiler 
(cherry picked from commit df1f4969d844ee913149e1fd93ab79d3e0754b5c)
 2015-07-24 12:05:26 +01:00
Shauren caf808163d Misc: Removed tabs 
(cherry picked from commit 4e83094354551b2b7efe40053cb57286b96c861b)
 2015-07-24 12:05:14 +01:00
DDuarte d12fec67f2 Core/Misc: Add a few consts to methods 
(cherry picked from commit 7d9843c380cf00f38ad0c5bc75fd387e50ee11da)

Conflicts:
	src/server/bnetserver/Packets/ConnectionPackets.h
	src/server/game/AI/SmartScripts/SmartAI.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceSaveMgr.h
	src/server/game/Support/SupportMgr.h
 2015-07-24 12:02:57 +01:00
Gacko 73fd4fb49c Fix non pch build. 
(cherry picked from commit 49a6f7b7bd9fb87ece479636e9aaccf3ea02e6da)
 2015-07-24 11:52:28 +01:00
Shauren b4adf3f5dd Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler 
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)

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
Gacko b703d53073 Fix non pch. 
(cherry picked from commit 5987391073b0a7a257658ecef51f1df4f0f38842)
 2015-07-24 11:35:47 +01:00
Vincent-Michael 5c5533c355 Core: Remove whitespaces 
(cherry picked from commit 5705555f1f9a259f2d4d52980ccb68d1b909b7a2)

Conflicts:
	src/server/game/Server/Packets/TicketPackets.h
 2015-07-24 11:35:34 +01:00
Carbenium e0a660a7a4 Fix bnet server build 2015-07-24 01:54:59 +02:00
Carbenium aaf3f090ea Fix build 2015-07-24 01:49:34 +02:00
mik1893 b1ac631f68 Merge pull request #15116 from pete318/runeforging 
[3.3.5] Core/Spell: Learn DK runeforging skill, when receving the spell book ability.
 2015-07-23 13:37:27 +02:00
Rushor 8faa902e89 DB/Misc: Updates from 6.x 2015-07-22 17:08:01 +02:00
Aokromes 2ec3884ccd Core/AuctionHouse: Fix misleading log 2015-07-22 13:45:14 +02:00
Aokromes d20ed095b1 Core/AuctionHouse: Fix misleading log 2015-07-22 13:40:55 +02:00
Rushor 14e60a9b10 DB/SAI: Update Azshara 2015-07-22 12:28:01 +02: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
Naios 73212c2b09 Core/Utilities: Add std::chrono::duration overloads to EventMap. 
* makes it possible to write:
```c++
events.ScheduleEvent(1, Seconds(10));
// ... or ...
events.ScheduleEvent(2, Minutes(1) + Seconds(20));
// ... or with C++14 support:
events.ScheduleEvent(2, 45s);
```

(cherry picked from commit e4e55a3dcbd846fd583b4fc86344d88ca63588d7)
 2015-07-22 02:18:41 +02:00
Naios 510194d6ba Core/Database: Enable perfect forwarding for chat format calls. 
(cherry picked from commit 4904318c43567277f2d32c758724e82874f29849)
 2015-07-22 02:18:39 +02:00
Naios 7f377a4f1b Core/Database: Enable perfect forwarding for database format calls. 
(cherry picked from commit ca16dc8c1b8da86f55a790a5f8cc6913dd005fcc)
 2015-07-22 02:18:38 +02:00
Naios e011ae63d5 Core/Logging: Enable perfect forwarding for logging format and args. 
* Handle timestamp parsing though cppformat.
* Change a wrong forward -> move

(cherry picked from commit 026ceb85b9e0e870d95cea42895e867198c156dd)
 2015-07-22 02:18:36 +02:00
et65 b0255927f0 Core/Logging: Partial cherry-pick from commit c6ab951025b0be3b0f6 
* solves differences 3.3.5 <-> 6.x because of make_unique workarround.

(cherry picked from commit c6ab951025b0be3b0f64dc8bb0703d4aa8bdb003)

Signed-off-by: Naios <naios-dev@live.de>
 2015-07-22 02:18:18 +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
Naios 09d34e0a9b Core/Utilities: Move EventMap into its own source file. 
* Move implementation details to .cpp.

(cherry picked from commit 11bfead40b431cf7bb8e86c4cada059ed614344b)

Conflicts:
	src/server/game/Battlegrounds/Battleground.h
	src/server/shared/Utilities/Util.cpp
 2015-07-22 02:02:51 +02:00
Naios 1741bfc64e Core/Utilities: Forward parameters of StringFormat correctly to fmt::sprintf. 
(cherry picked from commit 11dfd9e7d4967aaa2dcecc6d4f7a8ac21b4013fd)
 2015-07-22 02:00:05 +02:00
Naios 45058990e2 Core/Utilities: Remove global using of std::chrono namespace. 
* never use "using namespace" in header files!

(cherry picked from commit 6bf10c2b83063147737aee68d3b40a6d67e49d53)
 2015-07-22 01:59:57 +02:00
Naios 4c0c634814 Core/Utilities: Seperate std::chrono::duration typedefs into its own file. 
* add std::chrono_literals using decl. comment for future usage.

(cherry picked from commit 6e4a1b3e1e5a735f26284c560b1463cdd527b2fe)
 2015-07-22 01:59:50 +02:00
Carbenium ba5c1753a9 Fix merge 2015-07-22 01:46:01 +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 153818e24e Fix merge 2015-07-22 01:30:23 +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 963150dc8e Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
 2015-07-22 00:37:27 +02:00
Carbenium 5a0d9f97bc Fix merge 2015-07-22 00:35:28 +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 d175c5fa59 Fix merge 2015-07-22 00:16:41 +02:00
Carbenium 069f4c279b Merge commit 'e96676aeddb4763f6353675724fd6a033d60fbcb' into 4.3.4 2015-07-22 00:08:04 +02:00
Carbenium ee53cf1a88 Fix merge 2015-07-22 00:06:43 +02:00
Carbenium b82a072b25 Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4 
Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt
 2015-07-21 23:46:56 +02:00
Carbenium e44401c292 CRLF -> LF 2015-07-21 23:39:19 +02:00