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
23,934 Commits 4 Branches 146 Tags
2aaab040ce6fbfc04eb55b26352e00d12fecc577
Commit Graph

23934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rushor
2aaab040ce DB/Quest: A Flawless Plan 
* closes #12190
* thanks to @Pitcrawler + @Killyana for missing Spawns
 2015-07-25 08:52:47 +02:00
Aokromes
8b92c83f6b Update 2015_07_24_07_world.sql 2015-07-25 03:16:05 +02:00
Killyana
6bac7d0120 DB/NPC/Quest: Grizzly Hills Giant and Rallying the Troops 
Close #14781
 2015-07-25 02:00:32 +02:00
Rushor
6ce6445e38 DB/Spawn: Dark Iron Brewer 2015-07-25 00:51:45 +02:00
Rushor
a4b551ceb5 DB/Quest: Into the Soulgrinder 
* much thanks to @Killyana for all the Updates
* updates issue #3178
 2015-07-25 00:14:42 +02:00
Kilyana
09b11e2195 DB/NPC: Dark Iron Brewer 
closes #15047
 2015-07-24 22:32:46 +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
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
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
d20ed095b1 Core/AuctionHouse: Fix misleading log 2015-07-22 13:40:55 +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
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
Rushor
e2974746ae DB/Misc: Fixup 2 Runtimeerrors 2015-07-21 12:43:27 +02:00
jackpoz
aa042e94c2 Core/Collision: Fix race conditions in mmaps 
Fix a race condition in MMapManager happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.
 2015-07-20 20:52:36 +02:00
DDuarte
3c4484d782 Scripts/ScarletEnclave: Add weapons to Unworthy Initiate 
Closes #14954
Closes #14955

(cherry picked from commit 673648ee65)
 2015-07-20 01:16:47 +01:00
DDuarte
24ae640de3 Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid 
Additions to cb0e6cac63

(cherry picked from commit 57da378dea)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
 2015-07-20 01:16:06 +01:00
Rushor
0350088fd2 DB/Pathing: Dragonblight - Lights Trust + Jintha'kalar + Border Zone to Zul'Drak 
* also spawn missing Creatures for Border Zone to Zul'Drak
 2015-07-19 23:23:33 +02:00
jackpoz
ca7f31c6cd Core/Collision: Fix race conditions in vmaps 
Fix a race condition in VMapManager2 happening whenever a map was unloaded. GridUnload enabled was required to trigger the race condition.
 2015-07-19 21:10:27 +02:00
Rushor
51118b07cf DB/Pathing: Dragonblight - Scarlet Point 2015-07-19 20:57:35 +02:00
joschiwald
45d5ad270c Core/Spells: Renewed Hope also affects Flash Heal 
Closes #15037
 2015-07-19 18:19:08 +02:00
Rushor
5a2452f7d6 DB/SAI: Frigid Necromancer 
* some creatures near the Shrine should always cast this channel
 2015-07-19 17:44:00 +02:00
Rushor
1048de52bd DB/Pathing: Dragonblight - Jortun 2015-07-19 17:02:12 +02:00
Rushor
ab42772f8e DB/Creature: Crystalline Ice Giant - Add missing 'Boulder Miss'-Emotes 2015-07-19 16:38:11 +02:00
jackpoz
a22fd7dca5 Scripts/VioletHold: Fix build warnings 2015-07-19 14:57:10 +02:00
Vincent-Michael
9245bad755 Core/Misc: Update game object template locale in simple system 
(cherry picked from commit f4536f3812)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/QueryHandler.cpp
 2015-07-19 01:25:16 +01:00
pete318
9a4ccbaebd Learn death knight runeforging skill, when receving the spell book ability. (#13882) 2015-07-19 00:21:55 +00:00
Shauren
f880f2e778 Core/Threading: Clarified comment on ProducerConsumerQueue::WaitAndPop 
(cherry picked from commit 08316552b5)
 2015-07-19 00:48:17 +01:00
Naios
5ceb3fd0ab Core/Globals: Rename AddCreData -> AddCreatureData and MoveCreData -> MoveCreatureData 2015-07-18 18:21:56 +02:00
Rushor
ec55163ae8 DB/Pathing: Dragonblight - Coldwind Heights + The Crystal Vice 
* also Fixup startuperror from previous commit
 2015-07-18 18:02:14 +02:00
Rushor
5c5d18353c DB/SAI: Wastes Digger 
* add missing Attackemote
 2015-07-18 17:22:35 +02:00