Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,170 Commits 4 Branches 146 Tags
f90c7801d53a7761bcb907953feff4ea05c6f886
Commit Graph

2372 Commits

Author SHA1 Message Date
Ovahlord
1a1790b737 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.cpp
#	src/server/game/Skills/Archaeology/ArchaeologySites.cpp
#	src/server/scripts/Spells/spell_mage.cpp
 2018-09-17 15:43:22 +02:00
Full-Stack Developer
e023243ad8 Scripts/VoA: Archavon no longer leaps in melee range (PR #22414) 2018-09-11 13:27:53 +02:00
Ovahlord
65a0dbadd3 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-09-03 07:14:17 +02:00
Keader
f83fdd7693 Scripts/Misc: Removed more UpdateEntry on InstanceScripts 2018-09-02 21:36:18 +02:00
Keader
196eee57fa Scripts/ICC: Removed not needed entrys added in last commit 2018-09-02 21:25:35 +02:00
Keader
db38a286b9 Scripts/ICC: Fixed Deathbringer after Delay zone script's OnCreatureCreate 
Also removed some UpdateEntry hacks
Followup: b4a1887c4d
 2018-09-02 21:25:27 +02:00
Ovahlord
c808b981f7 Core/Movement: merged smooth waypoint movement. Followup commits will be merged soon (tm) 2018-08-02 15:38:35 +02:00
Aokromes
370df76016 Scripts/Misc: Use InstanceMap* in InstanceScript instead of Map* 2018-07-28 12:59:44 +02:00
Ovahlord
d6f96df74b Fixed build 2018-07-28 02:06:06 +02:00
Ovahlord
78ed8acdcc Core/Instances: merged some master branch commits in preparation for merging the upcomming instance save rewrite 2018-07-28 02:00:24 +02:00
Ovahlord
a0e288e761 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2018-07-23 15:57:10 +02:00
Treeston
f441d36d78 Misc: Pass std::chrono types by value everywhere. 2018-07-23 13:53:13 +02:00
Ovahlord
59d169e8e4 Merge branch 'dynamicSpawnMerge' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/Map.h
 2018-07-21 23:13:55 +02:00
Ovahlord
b976bc1187 Core/Spawns: merged Dynamic Spawning 2018-07-21 20:44:41 +02:00
Ovahlord
0d46b893fc Core/Objects: 
*merged 3.3.5 renaming of GetObjectSize() to GetCombatReach()
*made GetBoundaryRadius virtual and use it to determine the actual spell radius distance with it instead of using CombatReach
 2018-07-13 14:50:10 +02:00
Aokromes
54a69fdd43 Revert "Scripts/Ruby Sanctum: Fixed Baltharus target amount of Enervating Brand part 2" 
This reverts commit ff4859f26c.
 2018-06-09 08:09:43 +02:00
Aokromes
2052f3e151 Revert "Scripts/Ruby Sanctum: Fixed Baltharus target amount of Enervating Brand" 
This reverts commit 4b95dad0c9.
 2018-06-09 08:09:25 +02:00
Keader
ff4859f26c Scripts/Ruby Sanctum: Fixed Baltharus target amount of Enervating Brand part 2 
(I forgot the clones, ty Gildor)
 2018-06-09 07:34:58 +02:00
Keader
4b95dad0c9 Scripts/Ruby Sanctum: Fixed Baltharus target amount of Enervating Brand 2018-06-09 07:34:19 +02:00
Ovahlord
1998dc1287 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 
# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.cpp
 2018-05-17 12:44:55 +02:00
jackpoz
a5cad33ba0 Scripts/Icecrown Citadel: Fix "intended" crash 
Change an assert (that can happen easily using ".npc add") to a sanity check
 2018-05-12 13:23:44 +02:00
Jorge Turrado Ferrero
a8262881f9 Scripts/Ulduar: Fixed Vehicles when flame leviathan die(#21897) 2018-05-03 14:51:53 +02:00
Ovahlord
a241ee78e9 Core/Spells: merged some spell focussing and unit state changes 2018-04-29 12:54:38 +02:00
Aokromes
89d893c0b6 Core/Misc: whitespace/tab cleanup 2018-04-06 07:38:38 +02:00
ariel-
18b04b326e Scripts/ICC: use script searchers instead of saving list of creature pointers 
Closes #21644
 2018-03-29 00:51:39 +02:00
ariel-
4f0870cf32 And finally zmq nightmare is over 2018-03-28 06:11:01 -03:00
ariel-
5ff847159c Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources 2018-03-28 04:41:59 -03:00
Treeston
b09c808291 Scripts/Naxxramas: Fix an issue that could cause Sapphiron to stop using Drain 2018-03-12 12:21:37 +01:00
Ovahlord
e44bb5f387 Core/Entities: Phase Rework (main commit) 2018-03-08 22:58:50 +01:00
Wilcalaf
be2a17f191 Scripts/Nexus: Fixed a rare bug when sometimes Magus telestra managed to die while invisible preventing players from looting. (#21436) 2018-02-18 18:36:49 +01:00
sirikfoll
263617f81f Scripts/Icecrown Citadel: Prevent Lady Deathwhisper movement during first phase. 2018-02-18 18:00:13 +01:00
Aokromes
cbe84fa130 Core/Entities: remove grid-wide visibility from setActive and implement another method for it 2018-02-17 17:45:03 +01:00
Aokromes
ade258873e Scripts/TotC: Reduce Twin Val'kyr berserk timer from 10 minutes to 8 minutes on normal mode (match DBM). 2018-02-16 03:49:47 +01:00
Aokromes
4721d9814b Core/Scripts: Fixed some delayed enrage 2018-02-16 03:26:36 +01:00
Aokromes
9f0f00257e Core/Scripts: fix nopch 2018-02-16 01:38:48 +01:00
Treeston
c83d9d3a4b Scripts/AzjolNerub: Hadronox is a big spider mommy, and needs more room to pet her spider pets properly. Hopefully this'll reduce the number of evades happening during the encounter. Tag #20310. 2018-02-16 01:24:55 +01:00
ariel-
e6888f72e0 Core/Scripts: implemented Combined Toxins proc only from poisons 2018-02-16 01:22:39 +01:00
jackpoz
46467499f3 Scripting/Obsidian Sanctum: Fix crash 
Fix crash caused by calling Reset() in constructor (which is not allowed)
 2018-02-16 01:03:56 +01:00
Keader
563de5bf20 Scripts/Icecrown Citadel: Fixed Sindragosa spawn after grid unload 
ty sirikfoll :)
 2018-02-10 12:08:32 +01:00
Keader
a162d421ce Core/Scripts: Fixed tabs issues introduced in 5bef3e426a 2018-02-10 12:04:09 +01:00
Keader
2f8361d320 Core/Scripts: Fixed possible crashs related with JustDied 2018-02-10 12:03:59 +01:00
ariel-
9fdb4c0a4d Core/Scripts: fix non-functional Celestial Planetarium Access GO 
- Client only sends CMSG_GAMEOBJ_REPORT_USE for this one

Closes #19982
 2018-02-10 11:52:22 +01:00
Treeston
7997bebf9e Scripts/AzjolNerub: Missing nullptr check in Hadronox. Closes #21258. 2018-01-21 12:55:37 +01:00
Keader
2eb11c7b7c Scripts/Pit of Saron: Tyrannus followup 
fix new issue caused by 947cb6a453
 2018-01-21 12:39:16 +01:00
Aokromes
ca4b8d9881 Scripts/Pit of Saron: Fixed Tyrannus not working after evade 2018-01-21 12:39:02 +01:00
ariel-
562a76eb41 Core/Scripts: fix issues with 'Squeeze' on Yogg-Saron encounter 
- Unassigned spell script for 25-man difficulty

- Didn't remove aura on 25-man when tentacle killed
 2018-01-03 04:09:44 +01:00
Aokromes
46366373ab Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now. 2018-01-01 16:02:22 +01:00
ariel-
81b86e5de0 Core/Scripts: remove Quel'Delar from player inventory during "The Halls Of Reflection" quests (24480, 24561) 2018-01-01 15:17:37 +01:00
ariel-
9241e345f3 Core/Scripts: fixed Festergut applying more than one stack of Inoculated at once 2018-01-01 15:17:01 +01:00
Aokromes
f2ab43568a Core/AI: Making guid const& in SetGUID method 2018-01-01 14:55:20 +01:00