Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,638 Commits 4 Branches 146 Tags
d7ec960348a45739b7b730eed749ffecabaa2cbb
Commit Graph

20151 Commits

Author SHA1 Message Date
Aokromes
9684d48d1d Core/Script: Newline 2015-07-28 06:54:07 +02:00
Aokromes
cbe178881c Core/Scripts: Typo fix 2015-07-28 06:21:47 +02:00
Aokromes
7473269899 Core/Scripts: More 3.3.5a fixes 2015-07-27 22:17:48 +02:00
Aokromes
413d6621c3 Core/Misc: More warning fixes 2015-07-27 10:57:03 +02:00
Aokromes
095fc85986 Core/Misc: More warnings 2015-07-27 10:39:12 +02:00
Aokromes
666a292bfc Core/Misc: Fix more warnings 2015-07-27 10:30:02 +02:00
Aokromes
a409efa817 Core/Misc: Partialy revert previous commit 2015-07-27 10:18:48 +02:00
Aokromes
c80c77ff71 Core/Misc: Fix some warnings 2015-07-27 09:52:04 +02:00
Aokromes
7162c66930 Core/Misc: Few 3.3.5a fixes 2015-07-27 06:02:34 +02:00
Carbenium
81ae7c4eb6 Fix build after merge 2015-07-26 16:52:59 +02: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
joschiwald
66bbdfb82c Merge pull request #15164 from LuqJensen/mimiron 
Scripts/Ulduar: Fix a visual issue with Mimirons Rocket Strike and Fix Mimiron DB target attacking players
 2015-07-26 03:35:40 +02:00
Unholychick
0d5a0c81a8 Scripts/Ulduar: Fix a visual issue with Mimirons Rocket Strike 
In p2 he should fire left or right rocket at random, not always left one. ref https://www.youtube.com/watch?v=oY-nZ0EjDRw

Fix Mimiron DB target attacking players.
 2015-07-26 03:30:29 +02:00
Vincent-Michael
fd26c3c87c Core/Misc: Added new error logs for gameobject_questitem / creature_questitem tables 
(cherry picked from commit 2fcab335df)
 2015-07-26 01:21:13 +01:00
Vincent-Michael
730ddaf0bf Core: Fix non pch build 2015-07-25 23:21:25 +02:00
Vincent-Michael
d2d4bc2668 Core: Header cleanup in game/*/*.cpp 
(cherry picked from commit 2e586bc520)

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/DataStores/DB2Stores.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/ObjectGuid.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Handlers/BankHandler.cpp
	src/server/game/Handlers/CombatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TokenHandler.cpp
	src/server/game/Handlers/VoiceChatHandler.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Packet.cpp
	src/server/game/Server/Packets/SpellPackets.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/game/Warden/Warden.cpp
	src/server/game/Warden/WardenWin.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2015-07-25 21:53:30 +01:00
Shauren
130878c1a5 Core/Collision: Removed direct GameObject references from collision project 
(cherry picked from commit a029f97c82)

Conflicts:
	src/server/collision/Models/GameObjectModel.cpp
 2015-07-25 16:22:33 +01:00
MitchesD
c40d3be6dc Core/SmartScripts: added new action SMART_ACTION_COMBAT_STOP 
* this avoid using hacks like evade, faction change or rooting. I wonder how SAI could be without this

(cherry picked from commit d68df33c76)
 2015-07-25 16:54:25 +02:00
joschiwald
8a9f1b871a Scripts/Ulduar: fixed freya loot and added missing conditions 
thanks @Keader

Closes #15098
 2015-07-25 15:28:39 +02:00
Carbenium
2fde367029 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 02:50:18 +02:00
Carbenium
24c19fe8b4 Core/ObjectGuid: revert some changes from merge 2015-07-25 02:04:48 +02:00
Carbenium
bc8f5194c4 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 01:16:50 +02:00
Carbenium
ab0d8cec6d Core/Quest: Fix loading quests after merge 2015-07-25 01:02:55 +02:00
Carbenium
ad99eb8dfe server starts now successfully. login is possible 2015-07-24 22:15:10 +02:00
Warpten
a82e55f684 Scripts/RubySanctum: Halion: Correctly spawn X-shaped flames. 2015-07-24 17:11:30 +02:00
Vincent-Michael
9f04cbad21 Fix non pch build for Visual Studio 2015 compiler 
(cherry picked from commit df1f4969d8)
 2015-07-24 12:05:26 +01:00
Shauren
caf808163d Misc: Removed tabs 
(cherry picked from commit 4e83094354)
 2015-07-24 12:05:14 +01:00
DDuarte
d12fec67f2 Core/Misc: Add a few consts to methods 
(cherry picked from commit 7d9843c380)

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

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
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
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 e4e55a3dcb)
 2015-07-22 02:18:41 +02:00
Naios
510194d6ba Core/Database: Enable perfect forwarding for chat format calls. 
(cherry picked from commit 4904318c43)
 2015-07-22 02:18:39 +02:00
Naios
7f377a4f1b Core/Database: Enable perfect forwarding for database format calls. 
(cherry picked from commit ca16dc8c1b)
 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 026ceb85b9)
 2015-07-22 02:18:36 +02:00
et65
b0255927f0 Core/Logging: Partial cherry-pick from commit c6ab951025 
* solves differences 3.3.5 <-> 6.x because of make_unique workarround.

(cherry picked from commit c6ab951025)

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 11bfead40b)

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 11dfd9e7d4)
 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 6bf10c2b83)
 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 6e4a1b3e1e)
 2015-07-22 01:59:50 +02:00
Carbenium
ba5c1753a9 Fix merge 2015-07-22 01:46:01 +02:00