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

39683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alastro-Kraken
dc2e657238 DB/Item: fix text for Laird's Response 
Closes #27668

(cherry picked from commit 3b97c4fdb1)
 2022-03-25 23:57:49 +01:00
anzz1
a32587ce75 DB/Misc: game_tele Add teleport locations, fix/add testing maps 
Closes #27666

(cherry picked from commit 36877671ed)
 2022-03-25 23:57:47 +01:00
Alastro-Kraken
60bfb51985 DB/Gossip: Fix gossip for NPC Zel'mak 
Closes #27665

(cherry picked from commit 0dd751c760)
 2022-03-25 23:50:18 +01:00
Alastro-Kraken
003dd4c596 DB/Quest: Disable deprecated quest 'The New Horde' 
Closes #27664

(cherry picked from commit ae84f7c0e0)
 2022-03-25 23:49:35 +01:00
Alastro-Kraken
d6d26d1253 DB/Gossip: Fix conditions for Keristrasza's gossip options & texts 
Closes #27663

(cherry picked from commit 30d1f470fb)
 2022-03-25 23:48:45 +01:00
Alastro-Kraken
f8e60f0b1f DB/Gossip: Fix gossip for NPCs Sian'dur and Xor'juul 
Closes #27662

(cherry picked from commit 9f1c0a34db)
 2022-03-25 23:47:43 +01:00
offl
3de50c52fd Scripts/Spells: Handle player talk in spell scripts pt 3 (#27657) 
(cherry picked from commit e3409e277d)
 2022-03-25 23:45:29 +01:00
offl
8be723788d Scripts/Spells: Handle player talk in spell scripts pt 2 (#27640) 
(cherry picked from commit 7a4f1fd201)
 2022-03-25 23:42:43 +01:00
offl
4a65cf25ac Scripts/Spells: Handle player talk in spell scripts pt 1 (#27634) 
(cherry picked from commit c0c12ad761)
 2022-03-25 23:42:38 +01:00
offl
e0fea940b3 Scripts/Quest: Update 'The Light's Mercy' (#27633) 
(cherry picked from commit 7964636ea5)
 2022-03-25 23:25:17 +01:00
offl
a6f8dc3052 Scripts/Botanica: Rework Warp Splinter (#27621) 
(cherry picked from commit 78327500d8)
 2022-03-25 23:23:44 +01:00
offl
18d7814402 Scripts/Botanica: Rework Sarannis & Freywinn (#27611) 
(cherry picked from commit 41da43d9f2)
 2022-03-25 23:05:01 +01:00
kvolk2git
ae1f47fdf4 DB/Locale: Add missing ruRU quest_request_items_locale, quests 9001-10000 
Closes #27658

(cherry picked from commit 6811fe63bf)
 2022-03-25 22:54:27 +01:00
kvolk2git
1a4188fa9c DB/Locale: Add missing ruRU quest_request_items_locale, quests 8001-9000 
Closes #27653

(cherry picked from commit a80a1b2361)
 2022-03-25 22:53:54 +01:00
Alastro-Kraken
c1ba490336 DB/Gossip: Fix slight typo in unlearn talents gossip option text 
Closes #27660

(cherry picked from commit 553d773556)
 2022-03-25 22:53:25 +01:00
Alastro-Kraken
383bed2c8c DB/GossipText: Add missing gossip texts for NPCs in Odesyus' Landing 
Closes #27659

(cherry picked from commit 676cd425ee)
 2022-03-25 22:52:04 +01:00
Alastro-Kraken
c25819008e DB/Creature: Add waypoints for Delmanis the Hated 
Closes #27656

(cherry picked from commit 329fd578ba)
 2022-03-25 22:51:17 +01:00
Alastro-Kraken
87279a0bd2 DB/Loot: Remove fish which shouldn't drop from creatures 
Closes #27654

(cherry picked from commit f21b2db60e)
 2022-03-25 22:50:32 +01:00
Alastro-Kraken
2047afb4d8 DB/Quest: Improve script for quest Supplies to Auberdine 
Closes #27639

(cherry picked from commit 3bb7dd449f)
 2022-03-25 22:49:37 +01:00
anzz1
fc7b1bc866 DB/Misc: game_tele cleanup and add missing/new locations 
Closes #27628

(cherry picked from commit fd7f48545c)
 2022-03-25 22:48:06 +01:00
leelf00
ebd065ba1c DB/Locale: Add missing zhCN/zhTW page_text_locale, pages 15-1643 
Closes #27578 Closes #27585

(cherry picked from commit 28e962991e)
 2022-03-25 20:52:21 +01:00
Shauren
110a0beafa Core: Updated allowed build to 9.2.0.42852 2022-03-25 00:31:00 +01:00
offl
8e77287dd2 Scripts/BM: Remove unused text 
(cherry picked from commit fde8619dac)
 2022-03-25 00:25:13 +01:00
leelf00
211d08a66d DB/Locale: Add missing zhCN/zhTW quest_request_items_locale 
Closes #27555 Closes #27556 Closes #27557 Closes #27558 Closes #27559 Closes #27560 Closes #27567 Closes #27568 Closes #27569

(cherry picked from commit 747ee281dd)
 2022-03-25 00:24:20 +01:00
offl
979ce40c25 Scripts/Spells: Few fixes to spells with GameObjectActions (#27587) 
(cherry picked from commit dca7e51250)
 2022-03-25 00:23:41 +01:00
offl
cca7e2e98a DB/SAI: Use GameObjectActions in Suntara Stones quest script 
Ref #27579

(cherry picked from commit 04516d2214)
 2022-03-24 23:57:14 +01:00
offl
8b7effa4cf Core/SAI: Remove SMART_ACTION_ADD_AURA & actions to change object flags (#27571) 
(cherry picked from commit 5ba93a95de)
 2022-03-24 23:52:32 +01:00
Grindelwald
a799a10a90 Core/Spells: Add MaxAffectedTargets for Domination (#27541) 
(cherry picked from commit 5f0e80bf43)
 2022-03-24 23:50:03 +01:00
acidmanifesto
cba1293108 Scripts\Event: COG Corrections (#27532) 
Goldshire is a area not a zone. Zone is Elwynn Forest.

CHILDEREN is spelled with 1 E not 2.

(cherry picked from commit 5fc650645d)
 2022-03-24 23:48:43 +01:00
acidmanifesto
772104e134 DB/Misc: Event name fix 
Closes #27533

(cherry picked from commit 1dcbad76fc)
 2022-03-24 23:48:26 +01:00
leelf00
0e591e35d1 DB/Locale: Add missing zhCN/zhTW quest_offer_reward_locale 
Closes #27516 Closes #27521 Closes #27524 Closes #27526 Closes #27535 Closes #27536 Closes #27537 Closes #27538 Closes #27542 Closes #27543 Closes #27544 Closes #27545 Closes #27546 Closes #27547 Closes #27548 Closes #27549 Closes #27550 Closes #27551 Closes #27552 Closes #27553 Closes #27554

(cherry picked from commit 6b92aa3da4)
 2022-03-24 23:47:26 +01:00
Grindelwald
e811387bde Update inkeeper content (#27507) 
* Update localized hotel content

Update localized hotel content

* Using the database to display GOSSIP

The broadcast_text_locale has the relevant gossip_menu_option data, but C++'s strong coding makes them appear only in the default English.

(cherry picked from commit 27cb415c13)
 2022-03-24 23:33:59 +01:00
Giacomo Pozzoni
8c25abca72 Core/AI: Fix crashes caused by charmed Creatures having null AI for 1 map update tick (#27434) 
Implement using ScheduledChangeAI instead of nullptr to signal a required AI change

(cherry picked from commit 19e99db821)
 2022-03-24 22:35:05 +01:00
offl
52bb230e4c Core/SAI: Use GetBaseObject as second param of SMART_ACTION_ACTIVATE_GAMEOBJECT & reorder GameObjectActions (#27461) 
(cherry picked from commit 87cb0a4212)
 2022-03-24 21:55:46 +01:00
offl
9ea8cdb457 Core/SAI: Remove SMART_ACTION_SEND_GO_CUSTOM_ANIM, make SMART_ACTION_ADD_AURA & SMART_ACTION_SET_GO_FLAG deprecated (#27452) 
(cherry picked from commit 7709837539)
 2022-03-24 21:48:47 +01:00
malcrom
4755db7987 DB/Quest: Fix problem with not-available 'A Smokywood Pastures' Thank You!' (horde) 
(cherry picked from commit fa505a2209)
 2022-03-24 21:14:16 +01:00
kvolk2git
f070f164ab DB/Locale: Add missing ruRU quest_request_items_locale, quests 5001-8000 
Closes #27451

(cherry picked from commit e470a23a2f)
 2022-03-24 21:08:06 +01:00
offl
f026a42c20 DB/SAI: Get rid of AddAura pt 5 
It will be removed after 2 weeks for several reasons. Some of them: It was heavily abused and creates not obvious and thus dangerous logic in scripts, making them easily breakable. In lots of cases was used as hacky version of Cross Cast(one creature applies aura on another creature) while it should be casted by creature and not applied to it by another creature. In some cases it was used to ensure aura will be applied always (something like casting a spell with triggered cast flag). In nearly all other cases used for no reason. There's no such action in Blizz's scripting system, the reason why some auras are applied without SPELL_START and SPELL_GO has to be different. On top of that some auras in addons are channeling spells, some has effect Spawn, some has on-cast visuals. Using AddAura breaks them. That means if Blizz indeed used some kind of system only for on-spawn spells, all spells are casted or some are handled in another place.

(cherry picked from commit e96c713815)
 2022-03-24 21:05:09 +01:00
ihm-tswow
90b4c5afa2 Core/Misc: Verify LFG role selections by class (#27348) 
* Core/Misc: Verify LFG role selections by class

* style fix

Co-authored-by: MaxtorCoder <warsongkiller.s8@gmail.com>

* fix style

* improve LfgRoleClasses readability

* remove unnecessary comments

* add missing SharedDefine include

- try fix nopch

* style fix

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>

Co-authored-by: MaxtorCoder <warsongkiller.s8@gmail.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Shauren <shauren.trinity@gmail.com>
(cherry picked from commit 5e2b2fd3f8)
 2022-03-24 21:03:06 +01:00
Shauren
56dd1243fd Core/Units: Rename AnimationTier to AnimTier for consistency between branches 2022-03-24 20:44:26 +01:00
offl
37f425b1b3 Scripts/Spells: Remove unnecessary SetAnimationTier 
(cherry picked from commit 8214278cd8)
 2022-03-24 19:44:43 +01:00
offl
a6de812822 DB/SAI: Replace actions to change object flag with GameObjectActions 
SMART_ACTION_SET_GO_FLAG will be removed after 2 weeks, SMART_ACTION_ADD_GO_FLAG & SMART_ACTION_REMOVE_GO_FLAG after 2 weeks or later

(cherry picked from commit 2760c56c11)
 2022-03-24 19:38:16 +01:00
offl
7dbb7e5c65 DB/Creature: Assign correct broadcast texts in few cases 
(cherry picked from commit ebd61b5fd3)
 2022-03-24 16:20:21 +01:00
offl
c3368fd5fc Scripts/Quest: Rework 'The Cleansing' (11317,11322) (#27413) 
(cherry picked from commit a8464d34bb)
 2022-03-24 14:41:00 +01:00
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