Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,466 Commits 4 Branches 146 Tags
7ec1465af287c5ff61ba2bea1c4f75cfcd5dea7f
Commit Graph

19310 Commits

Author SHA1 Message Date
Warpten
80ec3e1515 Scripts/RubySanctum: Widen random angles for meteor flames. 
Don't QQ because "OMG you're not testing any of your stuff", I can't build TC atm.

Memo: Meteor Flames have
```
[12] UNIT_CREATED_BY_SPELL: 74689/1.046616E-40
```

which isn't in DBCs, exists, but is not seen in sniffs.
(cherry picked from commit 0dc6ea161d)
 2015-07-28 20:36:21 -03:00
jackpoz
0a94382637 Core/Spells: Fix Charge "no path" error with even bigger targets 
Addition to a328a11978 , clamp object size to [0,4] in case of very huge Creatures like Lord Marrowgar entry 36612
 2015-07-28 21:11:55 +02:00
jackpoz
10620b4e11 Core/Config: Describe better Wintergrasp.Enable option in worldserver.conf 2015-07-28 20:28:32 +02:00
jackpoz
f07fe63e50 Core/Threading: Handle CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE only in WorldSession update because it removes the Player from his Group which is not thread-safe 2015-07-28 20:23:18 +02:00
jackpoz
a7ee951d9e Merge pull request #15168 from jameyboor/3.3.5 
Core/Creature: Fix Creature::UpdateMovementFlags() ignoring DynamicTree height

Fix Creature::UpdateMovementFlags() checking only maps/vmaps height and skipping GameObject height stored in DynamicTree
 2015-07-28 19:54:49 +02:00
Warpten
ef93d1174d Scripts/RubySanctum: Fixed Meteor Flames 
(cherry picked from commit 982b59d2ec)

Update boss_halion.cpp
(cherry picked from commit 50c23bbcb8)
 2015-07-27 17:37:28 -03:00
DDuarte
b63082971f Build: Add missing include to MapScripts.cpp 
Fixes linker error in GCC/Clang
 2015-07-27 01:37:04 +01:00
Shauren
92b5b2e09a Travis build fix 
(cherry picked from commit a7d9c4e720)
 2015-07-27 01:13:29 +01:00
Jameyboor
b85b0c221b Fix UpdateMovementFlags ignoring DynamicTree height. 2015-07-26 15:08:33 +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
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
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
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
joschiwald
45d5ad270c Core/Spells: Renewed Hope also affects Flash Heal 
Closes #15037
 2015-07-19 18:19:08 +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
robinsch
f4b826002f #15108 2015-07-18 11:48:44 +02:00
mik1893
9889e6f730 Merge pull request #15036 from tkrokli/dk_wandering_plague 
Core/Spells: remove incorrect PvP combat state
 2015-07-15 18:54:23 +02:00
mik1893
90fcfb3f2d Merge pull request #14974 from pete318/stealth_work 
Stealth changes (Player stealthed vs NPCs) - 3.3.5
 2015-07-15 18:43:19 +02:00
mik1893
35f0d8e9c1 Merge pull request #14883 from tkrokli/omen_of_clarity 
[3.3.5] Core/Spells: Avoid losing spell mod auras when check on spellcast fails
 2015-07-15 18:21:43 +02:00