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,364 Commits 4 Branches 146 Tags
ddb0bc7b6a2415fe49c0937b7ff4da1372ea83bd
Commit Graph

4641 Commits

Author SHA1 Message Date
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
Nyeriah
781152a30c Scripts: Fix no-PCH build MKII 
Bah
 2016-02-10 04:00:28 -02:00
Nyeriah
b8445bbc20 Scripts: Fix no-PCH 
(cherry picked from commit 130f744c29)
 2016-02-10 03:21:49 -02:00
Nyeriah
c559a4762d Scripts/Magister's Terrace: Script Kalecgos' appearance after using the Scryer's Orb 
- Added missing waypoints, spells, emotes, proper timing... and prevent him from being summoned multiple times
Closes #13208, #16522
(cherry picked from 6a56ede179)
 2016-02-10 03:10:35 -02:00
joschiwald
3ac2ba721d Core/Gossips: added some sanity checks to prevent duplicate interaction 
(cherry picked from commit 8b6954e81b)

Scripts: addition to 8b6954e81b

Closes #16466

(cherry picked from commit b259d5c2bc)
 2016-02-06 18:16:11 +01:00
Shauren
db0b8bf24e Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing) 
Note: Extracting maps is required
 2016-02-02 19:13:04 +01:00
Shauren
8bc3f5545e Merge pull request #16378 from Zedron/6.x 
Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon
 2016-01-27 21:54:47 +01:00
Boomper
3f503cd1d1 Core/Spells: Fixed Heroic Leap 
Closes #14807
Closes #14134
 2016-01-27 21:53:05 +01:00
Lopfest
54ab2e0bdb Core/Scripts: SMSG_PLAY_ONE_SHOT_ANIM_KIT corrections. Thx to Arci 2016-01-26 18:58:02 +01:00
Zedron
4b4237174f Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon 2016-01-24 17:09:02 -06:00
myran2
2652d700e1 Core/Spells: Updated combo point handing 
Closes #15996
 2016-01-22 20:27:48 +01:00
jackpoz
8f13fe9c3b Scripts/ICC: Fix static analysis issue 
Fix an issue reported by static analysis

(cherry picked from commit 4191bb868a)
 2016-01-20 22:01:17 +01:00
jackpoz
8f91df0465 Scripts/Commands: Modify ".setskill" command to target current Player by default 
(cherry picked from commit e138e094a9)
 2016-01-20 21:59:49 +01:00
Francesco Borzì
6c3f2b9d9b Merge pull request #16208 from ShinDarth/putricide-fix 
[3.3.5] Scripts/ICC: Fixed Professor Putricide
(cherry picked from commit 3e42d83e9c)
 2016-01-20 21:56:55 +01:00
jackpoz
e7f7ffa73f Scripts/Commands: Modify ".learn" command to target current Player by default 
(cherry picked from commit f22b1938db)
 2016-01-20 21:28:17 +01:00
Killyana
a56f92e889 Script/Creature: Imprisoned Beryl Sorcerer 
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one

(cherry picked from commit 13e509a622)
 2016-01-17 14:04:51 +01:00