Commit Graph

26855 Commits

Author SHA1 Message Date
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
37e69b6954 Tools/Mapextractor: Updated dbc list 2015-07-02 00:31:40 +02:00
Shauren
9be3985b5c Core/PacketIO: Enabled auth opcodes 2015-07-02 00:31:25 +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
Naios
d4ade6b45f Dep/CppFormat: Update cppformat to cppformat/cppformat@7859f81233
* clean up our custom CMakeList.txt

(cherry picked from commit 93d1028d75)
2015-07-01 21:22:38 +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
Shauren
585f978c58 Core: Started work on 6.2.0.20182 2015-07-01 02:22:03 +02:00
Naios
eb3aeb8fd1 Cleanup duplicated names from contributors list.
* ref 1a7a9619d8

(cherry picked from commit e142c3b873)
2015-06-30 23:46:36 +02:00
Naios
0df90fa4a4 Core/Updater: Fix mysql cli password prompt when password is empty.
* ref: http://community.trinitycore.org/topic/11510-world-server-bug-enter-password-to-update/

(cherry picked from commit 4335611010)
2015-06-30 23:46:25 +02:00
Naios
a16d3e8eec Core/Utilities: Fix callback invokation when there are no tasks present.
* thx @joschiwald for noticing.

(cherry picked from commit 836ec5a6e6)
2015-06-30 23:46:09 +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
Carbenium
63d0a73598 Core/ObjectMgr: Add some constness 2015-06-30 16:38:07 +02:00
Carbenium
a0f9cadb18 Merge pull request #14979 from ShinDarth/gitignore
Add nbproject/* to gitignore
2015-06-30 14:45:48 +02:00
ShinDarth
993eb1ad8f Add nbproject/* to gitignore 2015-06-30 14:39:02 +02:00