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
28,402 Commits 4 Branches 146 Tags
b535d1e9f3a13fe99061135deb39bb04ff361e66
Commit Graph

4656 Commits

Author SHA1 Message Date
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
Saben65
12b7f330c6 Scripts/Zangarmarsh: Removes empty gossip_text that resulted in NPCs saying blank text to players after buffing them 
Closes #12697
Closes #16300

(cherry picked from commit ccf3ed40e2)
 2016-04-02 13:53:11 +02:00
Saben65
21371075ff Scripts/Shadowmoon Valley: Dragonmaw Peon 
Fixes issue where NPC does not attack, even when aggro'd.
Fixes #16210
Closes #16204

(cherry picked from commit ad425f9f17)
 2016-03-29 19:22:42 +02:00
treeston
5f6da87269 Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base 
(cherry picked from commit e203d78d2a)
 2016-03-29 19:22:02 +02:00
Shauren
4a679ba1be Core/Commands: Prevent creating accounts containing '@' character with .account create command 2016-03-28 19:40:15 +02:00
Naios
428908b8db Core/Scripts: Link the script project always statically 2016-03-24 01:31:52 +01:00
treeston
5fb88c7121 Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270) 
(cherry picked from commit 1050b68899)
 2016-03-22 23:37:02 +01:00
treeston
e2f2c70ba4 Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089) 
(cherry picked from commit 5b8b8c6530)
 2016-03-22 22:56:43 +01:00
Kittnz
78885769cb Merge pull request #16245 from sirikfoll/Turkinator 
Core/Spells Implement SpellScript needed for Achievement The Turkinator
(cherry picked from commit 529899675a)
 2016-03-22 22:13:31 +01:00
treeston
a254bdff59 Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base 
(cherry picked from commit 9091451818)
 2016-03-22 22:06:54 +01:00
Vincent-Michael
7cd0ddc529 Core: Fix non pch build 2016-03-22 10:04:55 +01:00
jackpoz
f837fc875a Merge pull request #15977 from tkrokli/landmine_knockback_achievement 
Scripts/Spells: Mine Sweeper achievement

(cherry picked from commit e59b4324b8)
 2016-03-21 23:35:57 +01:00
treeston
68c3af4166 Merge remote-tracking branch 'velinath/sai-migrations-3' into 3.3.5-base 
(cherry picked from commit 5084b17308)
 2016-03-21 23:22:03 +01:00
treeston
40ea130f5a Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-base 
(cherry picked from commit 1d9d03b289)
 2016-03-21 23:21:18 +01:00
treeston
c9fdb6af59 Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base 
(cherry picked from commit c7459327b2)
 2016-03-21 23:20:26 +01:00
Treeston
e6ab6b4b0b Merge pull request #16182 from velinath/sai-migrations 
Core/Scripts: remove unused npc_taxi scripts
(cherry picked from commit 48d0fd276d)
 2016-03-21 22:35:20 +01:00
joschiwald
ee38d8b4a1 Merge pull request #16171 from velinath/sai-migrations 
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
(cherry picked from commit f377a5875c)
 2016-03-21 22:18:29 +01:00
treeston
d68b809f9b Merge remote-tracking branch 'tkrokli/move_wyrmrest_temple_taxi_to_sai' into 3.3.5 
(cherry picked from commit e0ffc2921b)
 2016-03-21 21:46:04 +01:00
treeston
94b7e562e2 Merge pull request #16126 from velinath/taxi-to-sai 
(partially cherry picked from commit b6ed3d3fc2)
 2016-03-21 21:29:53 +01:00
jackpoz
96ca739a0b Merge pull request #14896 from Ofinka/dupl 
(cherry picked from commit 263f127d07)
 2016-03-21 19:04:39 +01:00
joschiwald
77e32e3af5 Scripts: Added combat abilities to trash mobs in Ruby Sanctum 
Thx @sirikfoll

SAI by @Keader

Closes #16703

(cherry picked from commit ef7a91d193)
 2016-03-20 22:23:40 +01:00
Naios
28d8f7f70d CMake: Use inherited dependencies in scripts 
* Removes the circular dependency between game <-> scripts

(cherry picked from commit 96bc31924a)
 2016-03-19 23:19:54 +01:00
Shauren
d47f23ef7c Merge pull request #16404 from Lopfest/6.x 
Core/Scripts: SMSG_PLAY_ONE_SHOT_ANIM_KIT can now be used in waypoint_scripts
 2016-03-08 08:25:58 +01:00
Naios
e40371909c Core/Scripts: Prepare commands once 
* Thanks @joschiwald for pointing this out

(cherry picked from commit eee75b80ac)
 2016-02-24 23:30:04 +01:00
Naios
346b9c1534 Core/Scripts: Remove the npc_netherweb_victim script which is handled through sai now 
* Ref 546c8a5b8e

(cherry picked from commit ecd74a8ccc)
 2016-02-22 16:58:02 +01:00
Naios
5534915f74 Core/Scripts: Split the huge scriptloader into smaller pieces 
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671
 2016-02-21 15:36:41 +01:00
Lopfest
facdc62b43 Merge remote-tracking branch 'upstream/6.x' into HEAD 2016-02-20 23:59:56 +01:00
w5860363
019d15591c Scripts/TheEye: Add spell Rend to advisor Thaladred the Darkener 
Closes #16594
Closes #15915

(cherry picked from commit e28cc7161a)
 2016-02-13 11:43:29 -02:00