Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,518 Commits 4 Branches 146 Tags
9bf507e592098abae7db825c66b1ba82cdfac5fd
Commit Graph

4683 Commits

Author SHA1 Message Date
Aokromes
9bf507e592 Merge pull request #16699 from tkrokli/triple_zone_cleanup 
Core/Scripts: triple zone cleanup
(cherry picked from commit 2387dbdda9)
 2016-04-08 22:01:40 +02:00
jackpoz
8046d5a94f Scripts/Ulduar: Fix crash 
Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload.
Close #16662

(cherry picked from commit 31cd082833)
 2016-04-08 20:38:09 +02:00
treeston
c25222c428 Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680) 
(cherry picked from commit d1a9d7765c)
 2016-04-08 20:32:01 +02:00
MitchesD
50ffea4d8f Merge pull request #16671 from tkrokli/zone_terokkar_forest 
Core/Scripts: zone_terokkar_forest cleanup
(cherry picked from commit b7e93f68c3)
 2016-04-08 20:30:10 +02:00
Treeston
adc7ee0c51 Merge pull request #16644 from Treeston/3.3.5-customcharmai 
Core/UnitAI: Rework creature-controlled player behavior.
(cherry picked from commit 4e4b2b9a13)
 2016-04-08 20:16:15 +02:00
Shauren
06734ebce9 Build fix 2016-04-08 19:49:06 +02:00
Aokromes
d4146a23ac Merge pull request #16038 from tkrokli/grammar_and_spelling_corrections_335 
[3.3.5] Core/Logs: English text corrections
(cherry picked from commit 4cd937140b)
 2016-04-08 19:48:58 +02:00
Shauren
14ed593019 Build fix 2016-04-08 18:37:59 +02:00
Kittnz
d9d2778eb8 Core/Pets: Move Egbert & Pandaren Monk into pet_generic.cpp 
(cherry picked from commit 542f5264d3)
 2016-04-08 18:33:47 +02:00
MitchesD
a5330017a8 Merge pull request #16258 from sirikfoll/feast 
Core/Spells Implemented SpellScripts Needed for Achievement Pilgrim's…
(cherry picked from commit 408572c472)
 2016-04-08 18:23:40 +02:00
treeston
c9b24515a5 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528) 
(cherry picked from commit c70e3e31a7)
 2016-04-08 18:07:34 +02:00
Shauren
da0dec4294 Merge pull request #16585 from Treeston/3.3.5-flightform 
Core/Spells: Disallow druid flight form while shapeshifted
(cherry picked from commit 101c3f9303)
 2016-04-08 18:01:35 +02:00
Shauren
4a3a178d7f Buildsystem: Initial changes to support building with vs clang toolset 2016-04-05 22:43:41 +02:00
Kittnz
b33afb6958 Pet/Misc: Improve Egbert's AI even more 
(cherry picked from commit af5f4ae85b)
 2016-04-05 22:15:54 +02:00
Kittnz
a6a8b5b3d4 Pet/Misc: Improve Egbert's AI 
(cherry picked from commit 2322ef3f50)
 2016-04-05 22:15:06 +02:00
Keader
f63db31c42 Fix multiple summon of Omen (Lunar Festival) 
(cherry picked from commit 8130de1b9a)
 2016-04-05 22:11:33 +02:00
Shauren
4e67383621 Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392) 
(cherry picked from commit 62aff401f6)
 2016-04-05 20:35:59 +02:00
treeston
73b917e122 Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments 
(cherry picked from commit cfed2d7a3d)
 2016-04-05 19:02:11 +02:00
treeston
53722a81a2 AI/BossAI: Make creature never chase targets that are out of bounds 
- Add missing const attribute on CheckBoundary arg.
- Prevent AI from attacking a target that is out of bounds. This prevents exploids such as killing Gluth/Deathbringer from out of bounds.

(cherry picked from commit 19ed18c881)
 2016-04-05 18:37:20 +02:00
ccrs
7672ca1945 Core/Spells: Rogue Honor Among Thieves 
(cherry picked from commit 983bbe4a4c)
 2016-04-05 18:36:57 +02:00
treeston
92381950ee Merge remote-tracking branch 'sirikfoll/npcMyranda' into 3.3.5 (PR #16438) 
(cherry picked from commit e5e97bedc0)
 2016-04-05 18:08:34 +02:00
Shauren
70412e7e25 Core/Misc: MSVC warning fixes 2016-04-05 00:15:56 +02:00
Rushor
1bf8e32b40 Merge pull request #16486 from Rushor/spiderman 
[3.3.5][6.x]Scripts/Karazhan: Implement Optional Boss Spawn
(cherry picked from commit c8f34656ef)
 2016-04-03 20:18:33 +01:00
Rushor
41385ce633 DB/Quest: King of the Foulweald - Improve Questevent 
* closes #2381

(cherry picked from commit 644b9dcd59)
 2016-04-02 20:44:51 +02:00
Shauren
3e59899f56 Build fix 2016-04-02 20:06:54 +02:00
Vincent-Michael
e518655b0f Scripts: Fixed warning 
(cherry picked from commit 96cb26de28)
 2016-04-02 19:40:41 +02:00
Kittnz
b6b151fb1e Build fix 
(cherry picked from commit add2179b75)
 2016-04-02 19:40:30 +02:00
Kittnz
b535d1e9f3 Pet/Misc: Implement Pandaran Monk followup 
(cherry picked from commit 5650b9deb2)
 2016-04-02 19:40:15 +02:00
Kittnz
c4b6e08829 Pet/Misc: Implement Pandaran Monk's pet abilitys 
(cherry picked from commit 64d1addbbf)
 2016-04-02 19:39:23 +02:00
Rushor
c3a2cbc844 Scripts/Northrend: Knockbackimmunity Cleanup 
(cherry picked from commit c560cb0a0c)
 2016-04-02 19:33:43 +02:00
treeston
ca1239af9f Code style, urand -> urandms. 
(cherry picked from commit e064000a35)
 2016-04-02 19:26:59 +02:00
Kittnz
422c8a97f6 Fix build & tabs 
(cherry picked from commit 57a5879070)
 2016-04-02 19:26:46 +02:00
Kittnz
a8504c6730 Pet/Misc: Implement Egbert's running around 
Closes #16479

(cherry picked from commit 859b617613)
 2016-04-02 19:26:35 +02:00
Vincent-Michael
33593ce0d5 Scripts: Added missing override 
(cherry picked from commit d1a185e3d5)
 2016-04-02 19:25:43 +02:00
Rushor
92a80979dd Game/Creature: Implement CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK 
* updates #16423

(cherry picked from commit 110e0fd092)
 2016-04-02 19:24:13 +02:00
treeston
9873800207 Item/Misc: Implement Toy Train Set and Wind-Up Train Wrecker. 
(cherry picked from commit 8c7cd03d08)
 2016-04-02 19:20:17 +02:00
sirikfoll
a962db8b3c Core/Scripts Script npc needed for Quest Torch Tossing part2 
Script for Npc Torch Tossing Target_Bunny_Controller, responsable for handle the targets rotation for Midsummer Fire Festival quest, Torch Tossing.

(cherry picked from commit 8b74038531)
 2016-04-02 18:32:38 +02:00
tkrokli
0466de43cc Core/Scripts/DB: remove hardcoded text from 'npc_disciple_of_naralex' 
- moved 2 #define text lines to enum, already in npc_text
- new gossip_menu_option for NPC 3678 Disciple of Naralex
- using `ADD_GOSSIP_ITEM_DB` instead of `ADD_GOSSIP_ITEM`

Tested on both alliance and horde characters, works just like before.

(cherry picked from commit bc03fedf6d)
 2016-04-02 17:36:48 +02:00
treeston
870a76ad10 DB/Creature: Add a new extra_flag CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ (0x00200000) that awards players credit for killing the creature even if less than 50% of damage was dealt by players. 
This can be used to fix quests such as "Heated Battle" or "If Valgarde Falls..." that are currently very hard to complete at the appropriate level due to "friendly" NPCs killing off the required targets too quickly for players to get 50% of damage in.

(cherry picked from commit d240ccb38c)
 2016-04-02 17:33:31 +02:00
tkrokli
97b70abe54 Core/Scripts/Uldaman: change hardcoded text to enum 
Change #define to enum {with brackets}

Possibly the smallest change so far in this series of core script changes.

(cherry picked from commit 627ec0e35e)
 2016-04-02 16:47:35 +02:00
treeston
677309743a Scripts/UtgardeKeep: Bonus Ingvar the Plunderer fixes to reset behavior. There should no longer be weirdness if a reset happens during the RP phase. 
(cherry picked from commit 815f43be7a)
 2016-04-02 16:46:13 +02:00
treeston
61d216593c Scripts/UtgardeKeep: Ingvar updates: 
- Roar at start of phase two
- Ingvar no longer does a weird move-jump towards his target when resurrecting
- Fixed a duplicate yell on phase one end

(cherry picked from commit c829fc7de4)
 2016-04-02 16:46:01 +02:00
Shauren
ddb0bc7b6a Scripts/Undercity: Removed obsolete script 
Partial cherry pick of 7a101bcf00
 2016-04-02 15:35:49 +02:00
jackpoz
9e0491db48 Scripts/Deadmines: Fix issues reported by static analysis 
Fix Coverity issue id 1022474

(cherry picked from commit d75469e31f)
 2016-04-02 15:32:10 +02:00
Keader
6005b3a5c5 Fix Kinetic Bomb stuck after knockback effect. 
(cherry picked from commit 36648d1079)
 2016-04-02 15:31:27 +02:00
tkrokli
50ad1cca00 Core/Scripts/DB: remove hardcoded text from 'npcs_dithers_and_arbington' 
- created DB gossip_menu_option entries for both NPCs
- added enum section instead of "magic numbers" in script
- replaced core text with pointers to DB text
- zone_western_plaguelands.cpp is now cleaned up

(cherry picked from commit 29c2a42324)
 2016-04-02 15:18:47 +02:00
Gabriele Gelardi
0d8a73e53c Scripts/Duel: prevent possible abuse in Duel Reset system 
(cherry picked from commit c0ed819e0c)
 2016-04-02 15:00:32 +02:00
Nick
6e5a129d91 Core/Scripts: Change door ID in Blackwing Lair 
as per 7d454c66f7

Change the name as well.

(cherry picked from commit a35a6279fe)
 2016-04-02 14:38:48 +02:00
jackpoz
f0bb02d8ee Scripts/Misc: Fix issues reported by static analysis 
(cherry picked from commit 0e76d67e49)
 2016-04-02 14:38:29 +02:00
joschiwald
9a202dfd4a Scripts/ICC/Teleporter: moved gossips to db 
(cherry picked from commit ea38a7d95b)
 2016-04-02 14:10:19 +02:00