Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,720 Commits 4 Branches 146 Tags
3db9034f4c9bfe532cb2e32fa3abff01c94de3bf
Commit Graph

39720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
offl
ab0805d048 DB/Texts: Correct text for General Bjarngrim 
(cherry picked from commit d57286521a)
 2022-03-24 00:07:21 +01:00
acidmanifesto
6d1e8b5597 DB/Creature: Correct faction for Greatmother Hawkwind 
Closes #27372

(cherry picked from commit c8eb463ae4)
 2022-03-24 00:06:47 +01:00
Cerveciento
797858365b DB/Locale: Add missing esES & esMX quest texts (Part 187) 
Closes #27371

(cherry picked from commit 982bda59a1)
 2022-03-24 00:06:02 +01:00
kvolk2git
7e39996957 DB/Locale/ruRU: Add missing offer rewards for quest id 8373, 11321, 12278, 13001 - 26013 
Closes #27353

(cherry picked from commit 70516c3552)
 2022-03-24 00:00:43 +01:00
offl
4004eb8b46 Scripts/Crypts: Rework Exarch Maladaar (#27313) 
(cherry picked from commit 35b55b3f21)
 2022-03-23 23:59:41 +01:00
offl
0097fd95b6 Scripts/Spells: Generic spell script for quest portals (#27305) 
(cherry picked from commit 251304b19c)
 2022-03-23 23:58:25 +01:00
offl
8d3a408fdc Scripts/The Eye: Few updates to Kael'thas & Astromancer (#27304) 
(cherry picked from commit 43315e0e19)
 2022-03-23 20:31:19 +01:00
offl
b6c02d20d5 Scripts/Botanica: Rework Laj (#27282) 
(cherry picked from commit 2fe3b6cc2f)
 2022-03-23 20:30:17 +01:00
offl
55fd025057 Scripts/Mechanar: Rework Nethermancer Sepethrea (#27277) 
(cherry picked from commit be00563a86)
 2022-03-23 20:16:47 +01:00
offl
505bf6903a Scripts/ZG: Improve High Priestess Jeklik (#27274) 
(cherry picked from commit 2779fb602f)
 2022-03-23 00:12:24 +01:00
kvolk2git
1faa6722ab DB/Locale/ruRU: Add missing offer rewards for quest id 12001 - 13000 
Closes #27347

(cherry picked from commit 1b487e1496)
 2022-03-23 00:11:16 +01:00
kvolk2git
fedde32c48 DB/Locale/ruRU: Add missing offer rewards for quest id 11001 - 12000 
Closes #27344

(cherry picked from commit be08bfc1be)
 2022-03-23 00:10:49 +01:00
w5860363
219b198d47 DB/Quest: Update 'Helcular's Revenge' (553) 
Closes #27322

(cherry picked from commit 42532e4c1d)
 2022-03-23 00:10:07 +01:00
kvolk2git
a779e928f1 DB/Locale/ruRU: Add missing offer rewards for quest id 10001 - 11000 
Closes #27326

(cherry picked from commit 1633913515)
 2022-03-23 00:08:24 +01:00
kvolk2git
5f43e6a465 DB/Locale/ruRU: Add missing offer rewards for quest id 9001 - 10000 
Closes #27315

(cherry picked from commit 08463dbd06)
 2022-03-23 00:08:01 +01:00
kvolk2git
7024b846ca DB/Locale/ruRU: Add missing offer rewards for quest id 8501 - 9000 
Closes #27310

(cherry picked from commit de66c7bf2d)
 2022-03-23 00:07:37 +01:00
Shauren
57d9d16442 Core/Auras: Properly clean up partial charm applications 
Ref #24876

(cherry picked from commit 9174281b92)
 2022-03-23 00:06:51 +01:00
offl
83b4c8cd37 Scripts/Spells: Small cleanup for gen/item spell scripts (#27311) 
(cherry picked from commit ef4c878d26)
 2022-03-23 00:06:37 +01:00
offl
4281049e0c Scripts/Misc: Migrate world event scripts to separate files 2 (#27309) 
(cherry picked from commit eb812bf3d5)
 2022-03-23 00:03:14 +01:00
offl
d3c9c14f83 Scripts/Misc: Migrate world event scripts to separate files (#27284) 
(cherry picked from commit 542c10094f)
 2022-03-22 23:50:20 +01:00
kvolk2git
12ae55df6c DB/Locale/ruRU: Add missing offer rewards for quest id 7501- 8500 
Closes #27285 Closes #27287

(cherry picked from commit 126915ee06)
 2022-03-22 23:19:59 +01:00
Cerveciento
98aec13c05 DB/Locale: Add missing esES & esMX quest texts (Part 186) 
Closes #27283

(cherry picked from commit 17b77768b2)
 2022-03-22 23:19:33 +01:00
offl
95803376f6 DB/SAI: c3973ff577 followup 
(cherry picked from commit da4d6f2dd1)
 2022-03-22 23:18:40 +01:00
Grindelwald
67954a6991 Core/Spells: Add MaxAffectedTargets to Chains of Naberius(36146) (#27291) 
Closes #27289

(cherry picked from commit c3973ff577)
 2022-03-22 23:18:01 +01:00
offl
5eac5ee2db Scripts/Spells: Void Zone's Consumption (#27265) 
(cherry picked from commit 44a6d393d7)
 2022-03-22 23:17:09 +01:00
Grindelwald
8f02596162 Core/Pets: Do not force pets to follow their charmer when possessed by player (#27293) 
* Fixes Eyes of the Beast

Closes #27226

Co-authored-by: Shauren <shauren.trinity@gmail.com>
(cherry picked from commit e63838f624)
 2022-03-22 22:41:54 +01:00
kvolk2git
dcbaa83690 DB/Locale/ruRU: Add missing offer rewards for quest id 6501- 7500 
Closes #27276

(cherry picked from commit 9cb86a42a9)
 2022-03-22 22:41:38 +01:00
kvolk2git
71e7ffd598 DB/Locale/ruRU: Add missing offer rewards for quest id 5501- 6500 
Closes #27269

(cherry picked from commit 2663d1da81)
 2022-03-22 22:41:13 +01:00
kvolk2git
8b657339c6 DB/Locale/ruRU: Add missing offer rewards for some quests with duplicate text. Part 4, last 
Closes #27268

(cherry picked from commit 2c2b3090c1)
 2022-03-22 22:40:35 +01:00
Krudor
2ec461c547 Core/PacketIO: Fixed ScenarioState packet structure (#27880) 2022-03-22 20:35:39 +01:00
Krudor
6cd44e6ca8 Core/Scenarios: Fix bad criteria evaluation in scenarios (#27881) 
* Adjust Scenario criteria evaluation process so that entire criteria trees are not completed when a single child tree is completed.
 2022-03-22 18:55:13 +01:00
Shauren
f465812e21 Core: Add 9.2.0.42825 build key for future use 2022-03-22 00:35:41 +01:00
acidmanifesto
29cf2a61af Core/Spells: Interrupt spells and auras before sending loot to client (#27279) 
(cherry picked from commit a24ea431dc)
 2022-03-22 00:19:47 +01:00
Gildor
1b56e13e87 Core/Battlegrounds: Avoid increasing player count per team when re-logging if player was already in the BG (#27266) 
(cherry picked from commit 6c512113d3)
 2022-03-22 00:17:33 +01:00
Shauren
d6ec0afc78 Core/Vehicles: Add additional logging to track issue #24876 
(cherry picked from commit f20b7a1080)
 2022-03-22 00:17:09 +01:00
Shauren
1d30f7ae2b Core/Misc: Add TempSummon timer to GetDebugInfo 
(cherry picked from commit 7b9b785c51)
 2022-03-22 00:16:57 +01:00
jackpoz
ccf8cf3bbf Core/SAI: Fix error message 
Fix the error message about valid range values for SMART_ACTION_ACTIVATE_GAMEOBJECT

(cherry picked from commit 5b9acbded1)
 2022-03-22 00:16:03 +01:00
Cerveciento
61073f86b0 DB/Locale: Add missing esES & esMX quest texts (Part 185) 
Closes #27262

(cherry picked from commit d0fd8e683c)
 2022-03-22 00:15:37 +01:00
CraftedRO
4cd643ec7f DB/Creature: Updates for Winterspring dragons 
Closes #27253

(cherry picked from commit d1201b963f)
 2022-03-22 00:14:44 +01:00
CraftedRO
70ce72201f DB/Creature: Add scripts to some creatures 
Closes #27252

(cherry picked from commit 164a32e484)
 2022-03-22 00:08:32 +01:00
offl
e27724b362 Core/SAI: Remove deprecated events and actions (#27258) 
(cherry picked from commit c508203895)
 2022-03-21 23:26:47 +01:00
offl
7698203122 Scripts/Creature: Replace trigger_periodic with unique scripts (#27240) 
(cherry picked from commit 7a307ebb6d)
 2022-03-21 23:12:00 +01:00
Gildor
726489201e Core/Battlegrounds: Fix text messages in Eye of the Storm when capture Draenei Ruins (#27260) 
(cherry picked from commit e02e784062)
 2022-03-21 23:03:00 +01:00
offl
ebcd45b7e1 Core/SAI: Remove reactState param from SMART_ACTION_WP_START (#27255) 
Ref #26728

(cherry picked from commit 04909bada8)
 2022-03-21 23:02:31 +01:00
Giacomo Pozzoni
791b759332 Core/SAI: Add SMART_ACTION_ACTIVATE_GAMEOBJECT action (#27216) 
Closes #27196

(cherry picked from commit 0817be8f76)
 2022-03-21 22:59:21 +01:00
offl
4c1b9d7455 DB/SAI: Prepare SMART_ACTION_WP_START to remove reactState param pt 10 
Closes #26728

(cherry picked from commit 8f4bf97b44)
 2022-03-21 22:11:38 +01:00
offl
b0df1a6cf5 DB/SAI: Prepare SMART_ACTION_WP_START to remove reactState param pt 9 
Ref #26728

(cherry picked from commit e4ca6e8d39)
 2022-03-21 22:10:02 +01:00
offl
300bf20907 DB/Quest: Rework 'If He Cannot Be Turned' (12896\12897) 
(cherry picked from commit 6b158fd254)
 2022-03-21 22:03:40 +01:00
Lucas Nascimento
4ed918fcb3 Core/Combat: Fixed combat after remove charm (#27248) 
https://github.com/TrinityCore/TrinityCore/pull/27038#issuecomment-958784361
(cherry picked from commit 0cc0b3f926)
 2022-03-21 22:02:34 +01:00
offl
64a217801b DB/SAI: Prepare SMART_ACTION_WP_START to remove reactState param pt 8 
Ref #26728

(cherry picked from commit a4574cf674)
 2022-03-21 22:00:41 +01:00