Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,541 Commits 4 Branches 146 Tags
75a5192c31390deca490dada3bdb0e89dcafdf8d
Commit Graph

31541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gildor
75a5192c31 Spells/Priest: Fix Power Infusion, shouldn't stack with Arcane Power (Mage) (#23619) 
* Spells/Priest: Fix Power Infusion, shouldn't stack with Arcane Power (Mage)

* delete unnecessary comments

* make @Aokromes happy ;)

* update group_id

* Rename 9999_99_99_99_world_335.sql to 2019_07_25_00_world_335.sql
 2019-07-25 14:44:56 +02:00
Gildor
6d2cd7f687 Core/Arenas: Remove doors in RL, NA and BE when arena has begun (#23606) 2019-07-25 12:55:42 +02:00
ForesterDev
0c317498a5 Scripts/Defines: cleanup some magic numbers in factions (#23631) 2019-07-25 12:54:49 +02:00
ForesterDev
b9756de7e5 Core/PacketIO: Updated SMSG_OVERRIDE_LIGHT (#23635) 
* Core/PacketIO: Updated SMSG_OVERRIDE_LIGHT

(cherry picked from commit 4c94108ba9)

# Conflicts:
#	src/server/game/Maps/Map.cpp
#	src/server/game/Server/Packets/MiscPackets.cpp
#	src/server/game/Server/Packets/MiscPackets.h
#	src/server/game/Server/Protocol/Opcodes.cpp
 2019-07-25 11:08:31 +02:00
ForesterDev
adbb8da025 Core/PacketIO: updated totem packets (#23634) 
(cherry picked from commit 5c813f6f02)

# Conflicts:
#	src/server/game/Entities/Totem/Totem.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Server/Protocol/Opcodes.cpp
#	src/server/game/Server/WorldSession.h
 2019-07-25 10:32:31 +02:00
ccrs
00d6ea5558 Core/Totem: 915f8a9 followup (oopsie) 2019-07-25 00:06:22 +02:00
ccrs
74926cf178 Core/Totem: 915f8a9 followup 2019-07-24 23:56:44 +02:00
ForesterDev
915f8a9d2c Core/Totems: update select display for shaman totems (#23583) 
(cherry picked from commit 8ca6a20e73)

# Conflicts:
#	src/server/game/Entities/Totem/Totem.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Spells/SpellMgr.cpp
#	src/server/game/Spells/SpellMgr.h
#	src/server/game/World/World.cpp
 2019-07-24 23:53:31 +02:00
Wyrserth
e2e37ec839 Core/Creature: fix mistake in Creature::GetAttackDistance(). 
Thanks Azelen for the heads-up!
 2019-07-24 20:13:13 +02:00
Giacomo Pozzoni
e68ebd3339 Core/Misc: Replace some abs() with std::abs() 
Always prefer std:: math function compared to C ones, as done in 7fe7f30521
 2019-07-24 13:44:55 +02:00
Keader
4c2f7df4f3 Core/Spells: Added spellgroup support to HandleModCastingSpeed (#23592) 
And fixed stack of Power Infusion, Bloodlust, Icy veins and Heroism.
 2019-07-24 08:31:34 -03:00
Killyana
8116c3cb66 DB/Creature: Aged Magnataur 2019-07-24 00:21:08 +02:00
Killyana
b54d667993 DB/Creature: Boss Portal: Purple (3.00) 2019-07-23 23:36:11 +02:00
Killyana
c1269e79d2 DB/Creature: Phase Wyrm 2019-07-23 23:04:08 +02:00
Killyana
73f9e79c57 DB/Creature: Add missing spawn to Sister Mercy 2019-07-23 20:09:46 +02:00
Killyana
2150441ebb DB/Creature: Padwai, Son of Orfus 2019-07-23 18:49:44 +02:00
Killyana
54db9ca257 DB/Creature: Sunblade Keeper 2019-07-23 16:11:28 +02:00
Killyana
2f461aa170 DB/Creature: Spawn phase 4 for Frigid Tomb and Foote Steppes 2019-07-22 19:42:24 +02:00
Killyana
57e4564816 DB/Creature: Add missing spawns in the Frigid Tomb phase 1 2019-07-22 17:12:27 +02:00
Killyana
1246cb0058 DB/GameObject: Fix the horde version of Dusty Journal 2019-07-22 15:25:50 +02:00
illfated
00645b8d4c DB/Quest: fix CompletionText for Silver Heart. 
Closes #23608.
 2019-07-22 15:21:56 +02:00
Wyrserth
044fba0a25 DB/Loot: separate Normal and Heroic Mark of Sanctification loot references for end-wing bosses in Icecrown Citadel. 
Closes #23310.
 2019-07-22 14:54:42 +02:00
illfated
9bc8044cb6 DB/Quest: fix CompletionText for Call of Earth (Part 2) (Draenei version). 
Closes #23623.
 2019-07-22 13:45:24 +02:00
Kelno
ef3ee63d88 Core/OPvP: Remove dangling line after 84b7b2e (PR #23625) 2019-07-22 12:05:36 +02:00
Wyrserth
8da2cd6b3f DB/SAI: Assault by Ground. 
Closes #11591.
 2019-07-22 02:40:09 +02:00
Wyrserth
bf8741c53d Script/ScarletEnclave: remove Eye of Acherus control and speed auras from player when the Eye of Acherus is dismissed. 2019-07-21 23:40:15 +02:00
Treeston
51cf1c7136 != and == are not the same thing. 2019-07-21 22:25:04 +02:00
Treeston
81fcd2e2d5 oops, that wasn't supposed to remain there (0e7c66c follow-up) 2019-07-21 20:28:23 +02:00
Shauren
211b2fa354 Core/Conditions: Reserve master branch condition types 2019-07-21 20:06:32 +02:00
Killyana
c8278cddeb DB/Misc: Steel Gate area 
From 17d717a704 by Grz3s
 2019-07-21 17:37:05 +02:00
jackpoz
2bac44c7d0 Core/Spline: Fix crash 
Fix crash when calling MoveSpline::ToString() on an empty spline
 2019-07-21 16:21:43 +02:00
Treeston
c4c739fea5 remove unnecessary check, 37f6982 follow-up 2019-07-21 15:49:42 +02:00
Shauren
adc82b78f7 Core/Conditions: Synchronize condition types between branches 2019-07-21 13:20:24 +02:00
Gildor
81d402446f Spell/Mage: Fixed duplicate / erroneous ID of the spell Consumption (#23618) 2019-07-21 12:03:20 +02:00
Treeston
49b04c0fdd Core/AI: No longer override chase movement with follow movement if the creature engages before JustAppeared has had a chance to fire. 2019-07-21 03:59:43 +02:00
Wyrserth
e5615402cc Core/Instance: remove wrong raid-only restriction in the logic that kicks offline players out of instances when the instance is reset. 2019-07-21 02:57:04 +02:00
Treeston
0e7c66cb4c Core/AI: Finally move the "is creature engaged" flag to be a property of the creature AI, where it honestly always belonged. Fixes #17981 and #23602 for real this time. 2019-07-21 01:50:52 +02:00
Killyana
eba10f309e DB/Creature: Steel Gate Pack Mule 2019-07-21 00:43:03 +02:00
Wyrserth
ec34d90aca DB/Conditions: the spell Flatulate used by Reanimated Abomination involved in the quest That's Abominable! should only hit the Scourge minions required by the quest. 2019-07-20 23:34:32 +02:00
Wyrserth
1d1c551e4c DB/Conditions: players can re-obtain the item Torch of Retribution from the questgiver only if they haven't already turned in the quest Set Them Ablaze! 2019-07-20 23:26:52 +02:00
Wyrserth
94c936844c DB/Creature: fix spawn position for Scout Tharr. 2019-07-20 23:22:59 +02:00
Wyrserth
1b4624b6b0 DB/Spell: Ignite Mana used by Baron Geddon, Aspect of Arlokk used by Hakkar and Time Bomb normal/heroic used by Urom should be negative. 2019-07-20 23:12:38 +02:00
Wyrserth
3837440f1f DB/Creature: remove deprecated spawns of NPCs Lady Liadrin, Peacekeeper Jadar and Investigator Asric in Shattrath, and move Arcanist Savan to his correct position in the Scryer's Tier. 2019-07-20 22:43:20 +02:00
Wyrserth
21857d11f7 DB/Quest: fix faction requirements for Pilgrim's Bounty introductory quests. 2019-07-20 22:34:00 +02:00
Wyrserth
9695285e66 DB/Event: add game_event entry for Operation: Gnomeregan and assign related creatures/gameobjects. 2019-07-20 22:24:15 +02:00
Wyrserth
a295a9f10a DB/Loot: add conditions for items Draconic for Dummies (Chapter II) and Draconic for Dummies (Chapter III). 
Those items aren't marked as "quest item" but are still tied to the quest The Only Prescription.
 2019-07-20 21:17:04 +02:00
Wyrserth
b8d86bba99 Script/SethekkHalls: fix gossip text and quest event for NPC Lakka in Sethekk Halls. 2019-07-20 21:02:23 +02:00
Wyrserth
97c472e913 DB/Quest: small cosmetic fixes for Ammo for Rumbleshot's outro event. 2019-07-20 00:13:38 +02:00
Killyana
e2f8fb2f82 DB/Misc: Death Knights starting area 2019-07-19 23:19:07 +02:00
Killyana
b7ca4d4e8e DB/GameObject: replace Circle of Aquementas with Aquementas Spell Focus. 
Closes #17560.
 2019-07-19 21:59:26 +02:00