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

17891 Commits

Author SHA1 Message Date
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
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
Rushor
ab0c0b7cb8 Merge pull request #15092 from robinsch/shamanT10enhancement 
Core/Spells:  Enhancement Shaman T10 4P bonus set 
closes #15090
 2015-07-15 14:21:43 +02:00
robinsch
230df99434 Core/Spells: Enhancement Shaman T10 4P bonus set #15090 2015-07-15 12:04:22 +02:00
mik1893
2295dc75e5 Merge pull request #14986 from robinsch/chimeraShot 
Scripts/Spells: Hunter's Chimera Shot - Serpent damage
 2015-07-14 16:47:24 +02:00
mik1893
ef4918d939 Merge pull request #14987 from robinsch/fixupSpellModDOT 
Core/Spells: Revert changes to Unit.cpp done in 198ffba
 2015-07-14 16:46:55 +02:00
P-Kito
a80501a30e Core/Spells: remove incorrect PvP combat state 
by @P-Kito; retrieved from #15027

Neither Vampiric Embrace nor Wandering Plague
should keep PvP players in combat state.

Players can't drink for extended periods of time in arena
debuffed with Death Knight's Wandering Plague + diseases
or when the counterpart is buffed with Vampiric Embrace.
Every tick keeps them in combat. This PR should fix the issue.
 2015-07-14 10:56:51 +02:00
duhow
cec97f168c Scripts/Commands: Allow .maxskill to be used with self or selected player 
Closes #15064
 2015-07-14 02:27:56 +01:00
joschiwald
7b1fee6c78 Scripts/FoS/Bronjahm: fixed corrupted soul fragment 
Closes #5215
 2015-07-12 14:37:46 +02:00
sirikfoll
5bbd7cff4c Spell Script for quests Among the Champions and The Grand Melee 
Solves issues with the credit spells hitting the mount instead of the player itself.
 2015-07-11 00:30:08 +02:00
DDuarte
57091cc5f1 CRLF to LF 
Seriously....
 2015-07-10 20:16:55 +01:00
Carbenium
a6f7bb029c Merge pull request #15023 from robinsch/combatMovement 
SmartAI: Incorrect removal of movement at SetCombatMove
 2015-07-10 00:38:01 +02:00
jackpoz
fae8269589 Core/Instances: Fix some Instance Lock chat messages 
Always send a Welcome type Instance Lock chat message when entering an instance instead of changing type based on remaining time.
Fix scheduled warning message to always send "Your instance lock for ... will expire in 0 minutes." even if there are hours left, issue added in 4193806dba , closes #11519 .
Update warning messages based on remaining time so that the most meaning is always used (6 hours left, 59 minutes left, etc).
 2015-07-08 23:32:04 +02:00
robinsch
2b3ea2e181 SmartAI: Fixed a bug where creatures would clear movement flags when they shouldn't at SetCombatMove. 2015-07-07 10:32:49 +02:00
Shauren
23e4472d14 Core/PacketIO: Removed timezone adjustments from ReadPackedTime - player's session timezone offset should be used there, not server offset 
(cherry picked from commit aa3b05c312)
 2015-07-06 22:25:34 +01:00
jackpoz
b574c99549 Scripts/Ulduar: Fix Flame Leviathan instance lock 
Fix Flame Leviathan instance lock not being granted to players because they were ejected from the vehicles as soon as boss died.
Players are now ejected some seconds later.
Close https://github.com/TrinityCore/TrinityCore/issues/15005
 2015-07-05 17:16:35 +02:00
jackpoz
e5258f92c8 Core/Spells: Normalize Z for last point in a charge path 
Normalize the new point that 124398feef adds to a charge path.
 2015-07-05 11:49:05 +02:00
jackpoz
6681b3600c Core/Misc: Fix build warnings 
Fix build warning reported by clang 3.6
 2015-07-04 19:28:11 +02:00