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

31148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SnapperRy
f0ddceeff4 Core/Quest: show DIALOG_STATUS_AVAILABLE instead of DIALOG_STATUS_REWARD for non-repeatable autocomplete quests. 
(cherry picked from commit 7666296f54)
 2017-10-03 17:47:19 +02:00
SnapperRy
6df51159c4 Core/Quest: send correct packet when a quest cannot be rewarded for item-related errors. 
(cherry picked from commit c067fe544d)
 2017-10-03 17:46:17 +02:00
SnapperRy
0794904f52 DB/SAI: improve timers and remove wrong text from Viera Sunwhisper. 
(cherry picked from commit 5c7c8202ec)
 2017-10-03 17:42:53 +02:00
joschiwald
3cba023e99 Fixed nonpch build 2017-10-03 17:39:37 +02:00
treeston
03a2f0d56a Entities/Creature: Fix an edge case issue where creatures would re-acquire target after respawn if they despawned while spell focusing. 
Instance/AzjolNerub: Fix Anub'arak wall and add sequence break info. Fixes and closes #18013.

(cherry picked from commit 0d725e1336)
 2017-10-03 17:35:19 +02:00
SnapperRy
c37d6a737a Core/Text: allow GENDER_NONE to use FemaleText in broadcast_text if not empty. 
Otherwise it would only use MaleText, which breaks cases where female NPCs change model to one that has no gender.

(cherry picked from commit b541310578)

# Conflicts:
#	src/server/game/Globals/ObjectMgr.h
 2017-10-03 17:34:49 +02:00
SnapperRy
ab15413aad DB/Conditions: show correct gossip for Baron Revilgaz if event Pirates' Day is not running. 
Also fix small typo in npc_text.
(cherry picked from commit 8aa798a9b0)

DB/Gossip: Wizlo Bearingshiner.
(cherry picked from commit 718d3e88c4)
 2017-10-03 17:33:23 +02:00
SnapperRy
2ecd46c58f DB/Misc: fix gossip text for Noth the Plaguebringer and remove wrong quest turn-in from the same npc. 
(cherry picked from commit bc78bfdea2)
 2017-10-03 17:28:27 +02:00
SnapperRy
2e79e206af Script/Quest: Arelion's Mistress. 
(cherry picked from commit 94c41c92b3)

Fix warning.

Also, the quest's name is Arelion's Secret, not Arelion's Mistress.
(cherry picked from commit 79acb9fa71)
 2017-10-03 17:26:23 +02:00
SnapperRy
5c7b821e17 Core/Quest: do not set a quest to failed if it's rewarded or has no status at all (not taken). 
(cherry picked from commit 97fd0c1b1a)
 2017-10-03 17:22:48 +02:00
treeston
f1929df956 Scripts/AzjolNerub: Make pulling Anub'arak a bit cleaner. 
(cherry picked from commit 59cbea00bc)
 2017-10-03 17:21:41 +02:00
treeston
10e8b61f90 Fix _DespawnAtEvade for other creatures to actually respawn said other creatures. 
Also fix add aggro for Hadronox.
Fixes and closes #18012.

(cherry picked from commit 1ecdea5374)
 2017-10-03 17:21:23 +02:00
SnapperRy
527c5081f9 DB/SAI: prevent Dawnblade Hawkrider's SAI from targeting players. 
Players will not be randomly attacked while in Isle of Quel'Danas anymore.

(cherry picked from commit dfb23cf0be)
 2017-10-03 17:20:21 +02:00
SnapperRy
1caba9cafe DB/Misc: add conditions for spell Arrow Assault and remove wrong texts for two Death Knight starting zone creatures. 
Closes #16831.

(cherry picked from commit 2161ac6757)
 2017-10-03 17:17:11 +02:00
treeston
a8e3654860 Core/Creature: Fix respawn logic to call reset react state BEFORE calling Reset(). Fixes Krik'thir behavior after a wipe (and maybe some others). 
Fixes and closes #18011.

(cherry picked from commit aab7abfd04)
 2017-10-03 17:17:11 +02:00
Smokexyz
160d6af043 Fix for a typo in variable name. (#18086) 
Causes an error on update.

(cherry picked from commit 4de5a6e005)
 2017-10-03 17:17:11 +02:00
SnapperRy
879b54a9e7 DB/Gossip: add gossip for creature Deino that is shown after completing the quest A Letter for Home. 
(cherry picked from commit ec0a8d58ee)

DB/Quest: Volatility (daily version) requires completion of Volatility (non-daily version).

Also fix comment for condition in previous commit.
(cherry picked from commit 115d2400e4)
 2017-10-03 17:17:10 +02:00
tkrokli
f463f73397 [3.3.5] Core/Scripts: move npc_braug_dimspirit to SAI (#17853) 
Additional change: The answers have been changed from containing only names
to include the text ` is my answer.` from the matching lines in `broadcast_text`.

- added DB creature_text entries for Braug Dimspirit
- added DB gossip_menu_option entries for this NPC
- implemented NPC `Say` line in reply to the wrong answers
- avoiding gossip exploits by turning off npcflags during talk
- added conditions for showing gossip depending on quest status
- removed deprecated SD comments in zone_stonetalon_mountains.cpp

(cherry picked from commit 86759c4537)
 2017-10-03 17:08:30 +02:00
tkrokli
8f718043d1 Core/Scripts: move npc_saat to DB (#17813) 
The core script only contains gossip handling + conditions.
- remove script from file the_black_morass.cpp
- thereby removing 1 line of hardcoded text
- remove redundant SD2 comments in header
- add SAI, gossip and conditions to DB
(cherry picked from commit 028a7b8e45)

Rename 2016_10_32_17813_world.sql to 2016_10_15_01_world.sql
(cherry picked from commit 13b748c682)
 2017-10-03 17:05:25 +02:00
tkrokli
c4ec0d8cfc [WIP] Core/Scripts: Gnomish Mind Control Cap and Gnomish Universal Remote (#17374) 
(cherry picked from commit b651bf271b)

Rename 2016_09_09_20_world.sql to 2016_10_15_00_world.sql
(cherry picked from commit d03b3e2643)
 2017-10-03 16:56:48 +02:00
ariel-
b2f9e0c95b Core/AI: initial support for monster sparring (#17673) 
(cherry picked from commit 303066509d)

Remove deprecated procEx usage.
(cherry picked from commit 84439ff4d7)
 2017-10-03 16:53:35 +02:00
SnapperRy
7385219565 Creature/AI: prevent Kologarn's arms from attacking. 
(cherry picked from commit d77a958809)
 2017-10-03 16:30:42 +02:00
Keader
c514227479 Core/Scripts: Implemented right Snobold Vassal behavior on Gormok fight. (#17934) 
(cherry picked from commit 8fb2dce017)
 2017-10-03 16:28:15 +02:00
joschiwald
00dce76c5d Fixed sql error 2017-10-03 16:02:51 +02:00
iridinite
fd53cbc5f2 [3.3.5] AHBot Characters (#17885) 
(cherry picked from commit 6dc0a9f04a)
 2017-10-03 16:02:32 +02:00
Keader
ff90a3f3c4 Core/Unit: Remove incorrect check that dont allow units attack your vehicle/passenger (#17932) 
(cherry picked from commit f0cd28be3d)
 2017-10-03 15:31:22 +02:00
SnapperRy
53dde7e2ca Core/SAI: always use DespawnOrUnsummon() for SMART_ACTION_FORCE_DESPAWN. 
SmartAI uses that same method internally, so there's no need to handle it in two different ways.

Does not affect functionality, but prevents useless SAI error log in case the target creature is not using SAI.

(cherry picked from commit 727f77ec6a)
 2017-10-03 15:31:09 +02:00
Gustavo
d4fa2cf43f Core/Scripts Boss Lady DeathWhisper improvements (#17389) 
(cherry picked from commit 8e82d8a9e7)

Rename 2016_99_99_99_world.sql to 2016_10_14_05_world.sql
(cherry picked from commit b4b8a7477b)
 2017-10-03 15:28:39 +02:00
SnapperRy
fdc0e1bc7e DB/Quest: add mail reward for the following quests: 
True Believers and Still Believing (leftover from previous commit), A Terrible Purpose, Wrath of Neptulon (still missing the 100 gold attached), A Letter for Home (Alliance and Horde), Tactical Clemency, Abandoned Mail, Hammershout the Elder and various Lunar Festival mails.

(cherry picked from commit 1824347594)
 2017-10-03 13:55:45 +02:00
SnapperRy
9ac42bcf74 DB/Quest: fix mail reward for True Believers and Still Believing. 
(cherry picked from commit 830594259e)
 2017-10-03 13:53:03 +02:00
joschiwald
3106b8b333 Scripts/AQ20: Fixed crash in npc_buru_egg and removed hack in spell_egg_explosion 2017-10-03 13:40:03 +02:00
Gacko
25111b09df Fix non-PCH build. 2017-09-25 21:34:15 +02:00
Shauren
d184768bbc Core/Misc: Improved error message reported by ASSERT_NOTNULL 2017-09-24 23:53:33 +02:00
joschiwald
0fcf6043b7 Core/Misc: Changed some SpellMgr::GetSpellInfo calls 2017-09-24 23:15:56 +02:00
Shauren
ee7f598e19 Contrib: Updated protobuf service generator with latest async handling changes 2017-09-23 23:11:18 +02:00
Shauren
65af89e4e6 Warning fixes 2017-09-22 19:39:04 +02:00
Shauren
91626f0339 Core/Bnet: Moved loading account info from rest service to session 
* This improves concurrency by removes thread synchronization when checking login tickets
* Also allows users to use external (web based) login systems
 2017-09-22 18:26:00 +02:00
Shauren
0c0f099dd6 Build fix 2017-09-21 22:09:15 +02:00
Shauren
3269a68427 Core/Bnet: Implement a way to handle turn protobuf service calls into async requests 2017-09-21 21:59:59 +02:00
Ryan
115dffde98 Core/Items: Implement ItemLevelSelector.db2 (#20325) 
ItemLevelSelector replaced ITEM_BONUS_ITEM_LEVEL_OVERRIDE in 7.2
 2017-09-15 21:23:41 +02:00
Shauren
6eb9973947 Core/Weather: Fixed weather updates to be thread safe 2017-09-14 22:33:40 +02:00
Shauren
6d2bc7abf4 Warning fix 2017-09-13 22:43:53 +02:00
Warpten
9a461126b7 Core/Spells: Implement SPELL_ATTR0_ON_NEXT_SWING_2. 2017-09-13 11:42:27 +02:00
Shauren
b2fc329adf Core/Items: Implemented glowing new items in inventory 2017-09-11 22:35:55 +02:00
Shauren
e0b2bad7d5 Core/Creatures: Changed NearestAttackableUnitInObjectRangeCheck to only consider neutral units as targets if they are already in combat with target searching unit 
Closes #13630
Closes #20205

(cherry picked from commit c8fdda7f86)
 2017-09-09 23:32:21 +02:00
vincent-michael
22d784aaa8 Revert "Build/Boost: Added support for finding vs 15.3 libraries" 
This reverts commit e6393a3f7c.
 2017-09-08 22:07:45 +02:00
vincent-michael
e6393a3f7c Build/Boost: Added support for finding vs 15.3 libraries 2017-09-08 20:03:13 +02:00
vincent-michael
3abfd66018 Build: Added 1.65.1 Boost version to FindBoost 2017-09-08 19:04:14 +02:00
Golrag
96f0086860 Core/Quests: Sync QuestFlags with WPP (#20285) 2017-09-08 15:59:42 +02:00
Shauren
6eccd3c822 DB: Deleted a bunch of invalid spell script assignments (old difficulty entries) 2017-09-07 23:12:16 +02:00