Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,639 Commits 4 Branches 146 Tags
299db7af1a0712c8a092da0a0f09bb10659ceed2
Commit Graph

39639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kvolk2git
299db7af1a Update cs_misc.cpp (#27418) 
(cherry picked from commit 8ac63c7952)
 2022-03-24 14:01:15 +01:00
kvolk2git
dff28aa6d4 DB/Gameobject: Make Maraudon portal clickable 
Closes #27419

(cherry picked from commit 4abfa61b67)
 2022-03-24 13:59:39 +01:00
Cerveciento
f13f05fe76 DB/Locale: Add missing esES & esMX quest texts (Part 188) 
Closes #27416

(cherry picked from commit 404e74ebe1)
 2022-03-24 13:30:11 +01:00
kvolk2git
96ecb3bd12 DB/Locale: Add missing ruRU quest_request_items_locale for quest with id 0-5000 
Closes #27410

(cherry picked from commit 5db9c100a0)
 2022-03-24 13:29:24 +01:00
offl
4994175805 DB/Misc: Rework intro event in Drak'Tharon Keep 
(cherry picked from commit 2c9622cbef)
 2022-03-24 13:28:01 +01:00
offl
6d2276d240 DB/SAI: Get rid of AddAura pt 4 
(cherry picked from commit f8a36dcd45)
 2022-03-24 13:26:04 +01:00
Gildor
a37f9b6693 Core/Battlegrounds: Avoid teleport players when relogin inside Strand of the Ancients (#27414) 
(cherry picked from commit d3b6d9a38c)
 2022-03-24 13:19:37 +01:00
offl
9dabdf7724 Scripts/Spells: Furious Rage & scripts for creatures who uses it (#27403) 
(cherry picked from commit 7ae525d5e5)
 2022-03-24 13:18:56 +01:00
Gildor
1bfbc371d5 Core/Battlegrounds: Avoid reset BG and Arena scoreboard stats and BG map achievement criterias when relogin if player was already in the BG (#27280) 
(cherry picked from commit fade6fbf4f)
 2022-03-24 11:48:37 +01:00
offl
cc94b595cf Scripts/Quest: Update 'It's All Fun and Games' (12887,12892) (#27394) 
(cherry picked from commit 41c8c4ba74)
 2022-03-24 11:41:01 +01:00
offl
69ee7582fc Scripts/MFF: Update Ahune's Ice Spear behavior (#27384) 
(cherry picked from commit 751a8b9e17)
 2022-03-24 11:39:27 +01:00
offl
0bb13b5dbd DB/SAI: Get rid of AddAura pt 3 
(cherry picked from commit 40b37fbdfe)
 2022-03-24 11:38:44 +01:00
offl
c2ab4942fd DB/SAI: Get rid of AddAura pt 2 
(cherry picked from commit 79f608cc3d)
 2022-03-24 11:37:52 +01:00
kvolk2git
8d051bfb2a DB/Locale: Add all missing ruRU quest_request_items_locale with duplicate text 
Closes #27382

(cherry picked from commit 131c1e10c7)
 2022-03-24 11:36:57 +01:00
leelf00
328c3953be DB/Locale: Add missing gossip_menu_option_locale for zhCN/zhTW 
Closes #27375

(cherry picked from commit 259f836041)
 2022-03-24 11:36:12 +01:00
offl
12548e45b6 DB/SAI: Get rid of AddAura pt 1 
(cherry picked from commit 0679b0a91f)
 2022-03-24 11:33:56 +01:00
offl
f9cefc0337 Scripts/HoS: Update Maiden of Grief (#27360) 
(cherry picked from commit a021d12f85)
 2022-03-24 00:26:04 +01:00
offl
4069baf141 Scripts/HoS: Update Sjonnir (#27357) 
(cherry picked from commit 36ee971415)
 2022-03-24 00:21:42 +01:00
offl
3cfca16359 DB/SAI: Replace SMART_ACTION_SEND_GO_CUSTOM_ANIM with GameObjectActions 
(cherry picked from commit 8516984ffe)
 2022-03-24 00:08:45 +01:00
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