Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,878 Commits 4 Branches 146 Tags
ccfaf663aa90d4df2f2b9a06d305edc168113b6d
Commit Graph

8331 Commits

Author SHA1 Message Date
DDuarte
ccfaf663aa Fix build and SQL import after cherry-picks 2015-07-03 02:10:54 +01:00
DDuarte
df15f87a9a DB/Schema: Increase size of ConditionValueX fields in world.conditions 
Required by bigger masks due to new races in MoP
 2015-07-03 01:33:52 +01:00
Carbenium
878548d94c Rename files after cherry-picks 2015-07-03 01:10:48 +01:00
Dr-J
f803178819 DB/Misc: Dire Maul Tribute stuff 
still needs core support for instance script so boss states can be checked.

* Script Mizzle the Crafty / Cho'Rush the Observer
* Add missing texts and gossips to more npcs
* Script Guard Mol'Dar, Guard Fengus and Guard Slipkik to give there buffs to a player has king of the gordoc buff
* Script Captain Kromcrush event to allow skipping with Gordoc Ogre Suit (WP not complete)
(cherry picked from commit 170794a029)
 2015-07-03 00:58:12 +01:00
Rushor
1dc373aca4 DB/Creature: Add Stranglethorn SAIs 
closes #12570

(cherry picked from commit db3b22c63e)
 2015-07-03 00:57:00 +01:00
Aokromes
8c735503c6 DB/Creature: Remy "Two Times" 
By Killyana, closes #12616
(cherry picked from commit 28ef8431ee)
 2015-07-03 00:56:14 +01:00
Rushor
1ba42a1e35 DB/Quest: Ammo for Rumbleshot 
* one remaining problem: the shootanimation of the cannon, tempfix will be http://pastebin.com/ZbwUg41v
* closes #12582

(cherry picked from commit cdb16ea27f)
 2015-07-03 00:54:03 +01:00
Aokromes
dbe47f2c2c DB/Creature: Marshal Dughan 
By Killyana, closes #12615
(cherry picked from commit 82664273cc)
 2015-07-03 00:38:25 +01:00
Aokromes
81fdc45680 DB/Creature: Mountaineer Stormpike 
By Killyana, closes #12711
(cherry picked from commit 291fc4d591)
 2015-07-03 00:37:32 +01:00
joschiwald
80bc699874 Core/BG/SOA: fixed interaction with flags and titan relic 
Closes #13091

(cherry picked from commit 8afa15ef15)

Conflicts:
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
 2015-07-03 00:28:22 +01:00
Duarte Duarte
fd1b69eb3f Merge pull request #14988 from ShinDarth/cherry-picks-6 
Some cherry picks from 3.3.5a to 6.x
 2015-07-01 17:28:28 -07:00
ShinDarth
2c358619c1 Remove SQL files wrongly added in previous cherry-pick merge 2015-07-02 01:07:27 +02:00
Aokromes
dd73dae245 DB/Quest: Protecting our Own (horde) 
By Killyana, closes #10184
 2015-07-02 00:42:08 +02:00
Aokromes
79129e8760 DB/Item: Rumsey's alcohols 
By Killyana, closes #13036
 2015-07-02 00:42:08 +02:00
Aokromes
296998ee88 DB/Misc: Hex of Jammal'an 
By Killyana, closes #12705
 2015-07-02 00:42:08 +02:00
Aokromes
8570cc2338 DB/Creature: Kodo Calf + Kodo Matriarch 
By Killyana, closes #12547
 2015-07-02 00:42:08 +02:00
Rushor
33861ef92b DB/Creature: Forsaken Crossbowman 
* Enable Shootvisual in all phases
 2015-07-02 00:42:07 +02:00
Rushor
8eba3f71f9 DB/Creature: Complete UP Movement 2015-07-02 00:42:07 +02:00
Rushor
e82841eac9 DB/Creature: Dragonflayer Fanatic 
* Add Emotescript for Dragonflayer in the Startroom of UP
 2015-07-02 00:42:07 +02:00
Rushor
2be3f0bbe7 DB/Quest: Escape from the Staging Grounds 
closes #3724
 2015-07-02 00:42:07 +02:00
Rushor
f1e5b95bc5 DB/Creature: Scarlet Hound 
by @Killyana
closes #14743
 2015-07-02 00:42:07 +02:00
Rushor
0611fdfa9d DB/Creature: Finish Grizzlyhills Movement 2015-07-02 00:42:06 +02:00
Rushor
141df25731 DB/Creature: Grizzly Hills Giant - Visual 
* Add Stonevisual which will be thrown periodically towards to Dummies
 2015-07-02 00:42:06 +02:00
Rushor
52435329e1 DB/Creature: The Farstrider Lodge - Flavor texts 
closes
 2015-07-02 00:42:06 +02:00
Shauren
cc7c5d8122 DB: Updated build data to 20182 2015-07-02 00:30:54 +02:00
Kinzcool
4bbbd9540a Core/Quests: Calculate the RewardMoney value with QuestMoneyReward.dbc and defined an unknown field 2015-07-01 17:57:09 -04:00
Kinzcool
97b6933435 DB/Quests: Updated quest_template up to 6.2.0 2015-07-01 17:52:46 -04:00
Rushor
43655c8fe1 Rename SQL files after cherry-picks 2015-07-01 21:36:59 +02:00
Aokromes
db25d2e3d1 DB/Creature: Gnome Engineer 
By Killyana, closes #12619
 2015-07-01 21:35:07 +02:00
Aokromes
1684eb36eb DB/Creature: Sten Stoutarm 
By Killyana, closes #12541
 2015-07-01 21:34:55 +02:00
Aokromes
4db448a4d1 DB/Quest: The test of Righteousness/Whitestone oak lumber 
By Killyana, closes #12377
 2015-07-01 20:59:40 +02:00
Aokromes
05113edafb DB/Creature: Nestlewood Owlkin 
By Killyana, closes #12507
 2015-07-01 20:59:35 +02:00
Aokromes
e7ae9f8f3c DB/Creature: Surveyor Candress 
By Killyana, closes #12528
 2015-07-01 20:59:28 +02:00
Aokromes
27ee4c60c0 DB/Creature: Overlord Runthak 
By Killyana, closes #12257
 2015-07-01 20:59:21 +02:00
Aokromes
d6f5d15be3 DB/Creature: Nancy and Grandpa Vishas 
By Killyana, closes #12263
 2015-07-01 20:59:14 +02:00
Aokromes
1ee635c62c DB/Misc: Event mount of dirt 
By Killyana, closes #12288
 2015-07-01 20:59:05 +02:00
Aokromes
4023a389a1 DB/Creature: Stinglasher 
By Killyana, closes #12296
 2015-07-01 20:58:59 +02:00
Aokromes
392cc5722d DB/Creature: Sah'rhee 
By Killyana, closes #12316
 2015-07-01 20:58:54 +02:00
Aokromes
d2cfbfd876 DB/Creature: Groundbound Soaring Razorbeaks 
By Killyana, closes #12326
 2015-07-01 20:58:48 +02:00
Aokromes
1b3f6f3dd0 DB/Creature: Syndicate Watchman 
By Killyana, closes #12262
 2015-07-01 20:58:43 +02:00
Aokromes
c390646ea4 DB/Creature: Naga Siren 
By Killyana, closes #12429
 2015-07-01 20:58:37 +02:00
Aokromes
7d396d2cda DB/Creature: Nessy 
By Killyana, closes #12431
 2015-07-01 20:58:30 +02:00
Aokromes
399fbb89d6 DB/Creature: Witch Doctor Zum'rah 
By Killyana, closes #12335
 2015-07-01 20:58:24 +02:00
Aokromes
f8172ae895 DB/Creature: Zixil 
By Killyana, closes #12479
 2015-07-01 20:58:14 +02:00
ShinDarth
ea9dded7d8 Rename SQL files after cherry-picks 2015-07-01 19:08:50 +02:00
Rushor
3137f2cb1d DB/Quest: Hellscream's Champion 
closes #9061
 2015-07-01 19:08:12 +02:00
Rushor
234dbab0a6 DB/Quest: The Earthbinder 
closes #14690
 2015-07-01 19:08:11 +02:00
Aokromes
7b1a3d56a0 DB/Misc: Fix startup errors 
By Killyana, updates #13707
 2015-07-01 19:08:11 +02:00
Kinzcool
75f9f64148 DB/Creatures: Updated creature_template up to 6.2.0 2015-06-30 16:51:43 -04:00
Kinzcool
eced1ba8bd DB/Misc: Added a missing VerifiedBuild column to creature_questitem & gameobject_questitem 2015-06-30 15:22:24 -04:00