Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,260 Commits 4 Branches 146 Tags
dd3dd5991d94de67fcb8fae36e857ce0fe045791
Commit Graph

30260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dr-J
41c560c874 DB/Quest: Bombard the Ballistae 
Add missing visuals for http://www.wowhead.com/quest=12232/bombard-the-ballistae
(cherry picked from commit 50223ea04f)
 2016-04-08 20:36:19 +02:00
Dr-J
b703fd0784 DB/Quest: Fire Upon the Waters 
Properly script http://www.wowhead.com/quest=12243/fire-upon-the-waters
1) Delete the kill credit npcs which do not exist in sniff
2) Spawn the proper bunnies for this quest
3) Add missing burning effect
(cherry picked from commit a3b2144750)
 2016-04-08 20:35:08 +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
42a01d62e6 Merge pull request #16457 from Treeston/3.3.5-standstatecondition 
[3.3.5] Add condition for unit sitting/standing
(cherry picked from commit b6720af4cb)
 2016-04-08 20:28:55 +02:00
Aokromes
7c51859214 Core/Misc: Fix header 
(cherry picked from commit 2eb9621f19)
 2016-04-08 20:24:52 +02:00
Shauren
cc2a683193 Core/PlayerAI: 6.x specific spec checks 2016-04-08 20:21:44 +02:00
treeston
604d08db52 build fix 
(cherry picked from commit d10c698430)
 2016-04-08 20:18:07 +02:00
treeston
e394cd298b Core/PlayerAI: Some more helper methods added. Also, charmed players no longer break crowd control. 
(cherry picked from commit a8f760b692)
 2016-04-08 20:17:56 +02:00
treeston
f5a1b75fbd Core/PlayerAI: More follow-up. Helper functions and some internal cleanup. 
(cherry picked from commit 5a3a21c2d0)
 2016-04-08 20:17:40 +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
Dr-J
765bd286b7 DB/Text: More texts 
More event texts
(cherry picked from commit dab661c8da)
 2016-04-08 20:06:47 +02:00
Dr-J
a154dfd308 DB/Quest: Taken in the Night 
Fix a problem, previous worked for me due to have duplicated timed action lists as originally got id wrong ie 22335 instead of 22355, had corrected id but failed to update the action to call timed action lists but failed to spot this has had timed action lists with both ids.
(cherry picked from commit c0c94d0e31)
 2016-04-08 20:05:12 +02:00
Dr-J
68d0a4f2eb DB/Quest: Something that does not melt 
Spawn additional http://www.wowhead.com/object=188441/splintered-bone-chunk

Closes #16642
(cherry picked from commit c14ef88522)
 2016-04-08 20:03:52 +02:00
treeston
745b771a4f Fix Baron Geddon and Ragnaros in Molten Core to do pure fire elemental damage with their melee attacks. 
(cherry picked from commit 9c0deaaebb)
 2016-04-08 20:02:33 +02:00
joschiwald
e06d4d424c Merge pull request #16651 from ariel-/movespeedfix 
Core/Unit: Fix typo
(cherry picked from commit 31b1da4a14)
 2016-04-08 20:01:21 +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
1460b01dde Core/Misc: Fixed a crash happening when a db string array was NULL 
Closes #15670

(cherry picked from commit e60f575ac8)
 2016-04-08 18:45:20 +02:00
treeston
9e07adccf4 I don't like drycoding. It's coarse and rough and irritating and it gets everywhere. 
(cherry picked from commit d4184065b6)
 2016-04-08 18:43:18 +02:00
treeston
b2e4a962d9 Incorrect AI aggression as a consequence of the LineOfSight change, episode three, revenge of the special AIs. Also, hopefully the last. No original trilogy please. 
(cherry picked from commit ab194d5ae3)
 2016-04-08 18:43:03 +02:00
Treeston
aca9efc47a Merge pull request #16633 from Treeston/3.3.5-talentinspect 
Core/Packets: Adjust 'TalentsInspecting' option
(cherry picked from commit 3e250fe4e8)
 2016-04-08 18:42:59 +02:00
Dr-J
c20ad186ff DB/Quest: Uncommon Scents 
The quests http://www.wowhead.com/quest=24805 and http://www.wowhead.com/quest=24805 are optional breadcrumb quests and this first quest from both faction chains is skippable.
(cherry picked from commit f2ab2464be)
 2016-04-08 18:38:50 +02:00
Shauren
14ed593019 Build fix 2016-04-08 18:37:59 +02:00
Kittnz
78576c1e63 DB/Pets: Fix script names for Egbert & Pandaran Monk 
(cherry picked from commit 1516600cef)
 2016-04-08 18:34:28 +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
749ff7491c Rename 2016_01_13_99_world.sql to 2016_02_18_01_world.sql (cherry picked from commit 8e8f597a07) 2016-04-08 18:24:25 +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
a931c7c906 Merge pull request #16637 from P-Kito/lfg_quest 
[3.3.5/6.x] Core/Player: Fix dungeonfinder quests not rewarding
(cherry picked from commit 59e59e412f)
 2016-04-08 18:22:37 +02:00
Dr-J
eb15a1f0d1 DB/Event: Love is in the Air (Kwee Q. Peddlefeet) 
Script all instances of Kwee Q. Peddlefeet to give option to give Lovely Charm Collector's Kit.  Player does not need quest for this option to be available, gossip menu already existed in db and all but 2 of the Kwee Q. Peddlefeet already had gossip menu set in creature template but no gossip npc flags.
(cherry picked from commit 67b6f38287)
 2016-04-08 18:21:34 +02:00
Dr-J
a4cc1caa93 DB/Event: Love is in the Air 
Implement some missing texts and gossips
(cherry picked from commit 982e3ef3ef)
 2016-04-08 18:19:17 +02:00
Killyana
1f55850d25 DB/Event: Fix all Commoners spawns, models, auras and quests 
Updates #16129

(cherry picked from commit 1399e705eb)
 2016-04-08 18:16:29 +02:00
Killyana
ece592f18b DB/Quest: When All Else Fails 
Closes #16586
By @Pitcrawler

(cherry picked from commit 7c7029c25c)
 2016-04-08 18:12:55 +02:00
Killyana
87f5f43dd6 DB/Creature: Add FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ to Dying Soldier 
Closes #16033

(cherry picked from commit fef06781f5)
 2016-04-08 18:08:39 +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
Dr-J
302bd9a981 DB/Misc: Various quest updates 
Free at Last closes #16577
Put on Your Best Face for Loken closes #16576
Send Them Packing closes #16516
(cherry picked from commit 4d51cf0305)
 2016-04-08 18:04:47 +02:00
Killyana
8bbfa0a0a3 DB/Creature: Fix model for Invisible Stalker Grizzly Hills 
Closes #16578

(cherry picked from commit 23262b94f0)
 2016-04-08 18:02:52 +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
Rushor
c0202e2365 DB/Creature: Arred SAI 
(cherry picked from commit 8a7722a49c)
 2016-04-08 17:55:51 +02:00
Shauren
1d45b2c384 Core/Items: Fixed transmog not saving item to db 2016-04-08 16:47:56 +02:00
Shauren
f4029faece Core/Spells: Implemented spell effect 243 - SPELL_EFFECT_APPLY_ENCHANT_ILLUSION (and fixed enchant visuals, for real this time) 2016-04-07 21:36:36 +02:00
MitchesD
8b1428cca6 Core/BattlePets: updated enums to 6.2.4 2016-04-07 16:16:26 +02:00
Shauren
08c27d3205 Core/Misc: MSVC /W4 warning fixes 2016-04-06 18:40:41 +02:00
Shauren
4a3a178d7f Buildsystem: Initial changes to support building with vs clang toolset 2016-04-05 22:43:41 +02:00
Dr-J
792299bbd5 DB/Misc: The Fleshwerks (Phasing) 
Once http://www.wowhead.com/quest=13144/killing-two-scourge-with-one-skeleton has been rewarded in sniff player gains the aura http://www.wowhead.com/spell=58139/fleshwerks-phase and phase changes to 64.

Some creatures and gameobjects which are already on tc are also part of this has had previously been set ie the npcs involved with http://www.wowhead.com/quest=13235 and the objects for http://www.wowhead.com/quest=13220.

The http://www.wowhead.com/npc=30696/corpulent-horror for http://www.wowhead.com/quest=13212 where spawned but were incorrectly spawned in phase 1

Also adds the following spawns to this phase which were missing from tc: -

* http://www.wowhead.com/npc=30697/putrid-colossus
* http://www.wowhead.com/npc=31015/intrepid-ghoul
* http://www.wowhead.com/npc=30703/ebon-blade-champion
* http://www.wowhead.com/npc=30704/argent-paladin
* http://www.wowhead.com/npc=31432/ghostwing
(cherry picked from commit fb895cc99b)
 2016-04-05 22:31:38 +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
treeston
0654b3b816 Check to make sure we aren't dispelling a buff for _all_ dispel types, not just magic. Closes #15321. 
(cherry picked from commit 98860911e2)
 2016-04-05 22:14:45 +02:00
treeston
60b98ecc27 Revert "Merge pull request #16483 from Treeston/3.3.5-debuffimmunity" to fix #16589 while I investigate the retail behavior of SPELL_ATTR_0_UNAFFECTED_BY_INVULERABILITY further. 
This reverts commit d67e87733b, reversing
changes made to cfed2d7a3d.

(cherry picked from commit 26bbba4b8d)
 2016-04-05 22:12:11 +02:00
Keader
f63db31c42 Fix multiple summon of Omen (Lunar Festival) 
(cherry picked from commit 8130de1b9a)
 2016-04-05 22:11:33 +02:00