Commit Graph

7739 Commits

Author SHA1 Message Date
Vincent-Michael
caeb933d9e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-02 22:36:58 +02:00
Vincent-Michael
4322a0dc37 DB/Quests: Fix half sleep fail in 6a47175523 2014-10-02 19:54:25 +02:00
Vincent-Michael
3545d60b7d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-02 05:50:35 +02:00
Vincent-Michael
6a47175523 Core/Spells: Added hack for "Bark for the Barleybrews!" quest credit (for alliance-side) (meh, blizzard :/) 2014-10-02 05:49:32 +02:00
Vincent-Michael
7696bec538 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-01 21:25:41 +02:00
Vincent-Michael
6357560186 Core/Spells: Added hack for "There and Back Again" quest credit (for alliance-side) (meh, blizzard :/) 2014-10-01 20:53:16 +02:00
Vincent-Michael
faa4fc1b31 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-30 22:33:30 +02:00
Vincent-Michael
f9cf45981f DB/Brewfest: Convert some brewfest for alliance:
- Fix Quest "Bark for the Barleybrews!" (for Alliance-side)
- Fix Quest "Bark for the Thunderbrews!" (for Alliance-side)
2014-09-30 22:07:26 +02:00
Vincent-Michael
364f32f1ba DB/Brewfest: Convert some brewfest for alliance:
- Fix Quest "There and Back Again" (for Alliance-side)
- Fix Quest "Now This is Ram Racing... Almost." (for Alliance-side)
2014-09-30 21:33:33 +02:00
Vincent-Michael
479afe6123 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-30 18:20:20 +02:00
Dr-J
3f5e3a877a DB/Misc: The Green Hills of Stranglethorn (3.3.5)
Script replacement of misplaced chapters if player is rewarded for quest which rewards chapter but does not have item and has not turned in quest 338.
2014-09-30 16:07:24 +01:00
Mihapro
79936ef1b0 DB/Quests: Fear No Evil quest script
Closes #13236
Fixes #12331
2014-09-29 14:17:24 +01:00
DDuarte
f805d04941 Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-29 12:48:34 +01:00
Kinzcool
35b267e7f7 DB/Gossips: Added some more assignation to their proper BroadcastTextID 2014-09-29 06:54:04 -04:00
Aokromes
b705e7093c DB/Quest: Fix more locales on 3.3.5a 2014-09-29 04:50:20 +02:00
Kinzcool
70bf81ad1b DB/Gossips: Added a missing one from 8983fbba53 2014-09-28 22:32:53 -04:00
Kinzcool
8983fbba53 DB/Gossips: Localized talents gossips by assigning them to their BroadcastTextID
* Closes #12546
2014-09-28 21:54:51 -04:00
Aokromes
9657d1879a Rename 2014_09_28_00_world_conversion.sql to 2014_09_28_00_world.sql 2014-09-28 11:02:49 +02:00
Aokromes
653641e679 DB/Misc: Fix startup errors 2014-09-28 11:00:46 +02:00
Kinzcool
acb2a35fcb DB/BroadcastText: Assigned BroadcastTextIDs to some texts 2014-09-27 23:23:15 -04:00
Vincent-Michael
aa638d9bc7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Loot/LootMgr.cpp
2014-09-28 04:25:15 +02:00
Vincent-Michael
bcfc2911b4 SQL: Fix sql import on unix 2014-09-28 04:09:40 +02:00
Malcrom
8a7f06fe43 DB/Loot Template: If I put the updates sql in the right dir in the first place none of this would be happening... 2014-09-27 22:49:56 -02:30
Malcrom
0d92b4cc15 DB/Loot: Update SQL 2014-09-27 22:46:07 -02:30
Malcrom
55b43c6751 Core/LootMgr: Update lootMgr to normalize loot_template tables 2014-09-27 22:40:58 -02:30
Aokromes
e755502a7f Update 2014_09_22_00_world.sql
Fix travis import
2014-09-27 22:01:27 +02:00
Vincent-Michael
774195a935 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-27 12:45:29 +02:00
Nyeriah
3282dea5c5 DB/SAI: Re-add SAI for Sprinkle that was accidentally deleted at d672e78a5b 2014-09-27 06:29:04 -03:00
Vincent-Michael
da91ae1f22 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
2014-09-27 05:23:46 +02:00
Vincent-Michael
eccc6e97ea SQL: meh, save button 2014-09-27 02:17:06 +02:00
Vincent-Michael
ebdf156212 DB/Gameobject: Fix wrong "Brewfest Banner" position in durotar 2014-09-27 02:14:57 +02:00
Vincent-Michael
a6a23a73af Misc/Brewfest: Fix Quest "11407 - Bark for Drohn''s Distillery!" / "11408 -Bark for T''chali''s Voodoo Brewery!" 2014-09-27 01:19:20 +02:00
Vincent-Michael
2fe25d714d DB/Brewfest: Fix quest start for "Bark for T'chali's Voodoo Brewery!" / "Bark for Drohn's Distillery!"
To/Do: Fix quest kill credit
2014-09-26 22:34:21 +02:00
Vincent-Michael
b620b2d27a DB/Quest: Fix LimitTime for Quest "Bark for Drohn's Distillery!" / "Bark for T'chali's Voodoo Brewery!" / "Bark for the Barleybrews!" / "Bark for the Thunderbrews!" 2014-09-26 21:23:20 +02:00
Aokromes
9998631372 DB/Creature: Delete incorrectly spawned Felhunter 2014-09-26 08:46:03 +02:00
Dr-J
6974a924a3 DB/Quest: Tirion's Gambit
Script for chosen zealots is not perfect as this should surround player/tirion in a circle but cant think of anyway other than every chosen zealot having its own wp and sai.

Closes #10474
2014-09-26 02:21:33 +01:00
Shauren
ea4dd2c8f4 Scripts/Icecrown Citadel
* Fixed Deathbringer Saurfang faction
* Fixed Coldflame faction
2014-09-25 21:15:20 +02:00
Vincent-Michael
1739ff3443 DB/Brewfest: Fix "Ram Master Ray" gossip 2014-09-25 20:24:52 +02:00
Malcrom
84fdc55db8 Scripting/Isle of Queldanas: Moved Converted Sentry to SAI.
Closes #13121
2014-09-25 12:10:19 -02:30
Vincent-Michael
c3805aa512 Misc/Events:
- Fix Quest "There and Back Again" (only Horde-side)
- Fix Quest "Now This is Ram Racing... Almost." (only Horde-side)
- Fix more spell mechanics for racing ram
To/Do: Fix gossips and some optimize
2014-09-24 22:21:44 +02:00
Dr-J
b949521a52 DB/Quest: Free Your Mind
Proper script for http://www.wowhead.com/quest=12893

Previous script gave credit on these npcs been killed which was wrong behaviour
2014-09-24 13:46:06 +01:00
Vincent-Michael
4c25454b77 Core/Spells: Added missing stuff in 44bcfb86f5 2014-09-23 21:50:45 +02:00
Vincent-Michael
44bcfb86f5 Core/Spells: Fix Ram Racing mechanic
To/Do: Fix Quests and your lazy ass :/
2014-09-23 21:30:47 +02:00
Dr-J
eae8437b0e DB/Creature: General Lightsbane
Script General Lightsbane for quest If He Cannot be turned
2014-09-23 19:55:54 +01:00
Dr-J
8b6bb8ff6b DB/Misc: Error fixes
Closes #13182
2014-09-23 11:13:37 +01:00
Dr-J
374ea68c48 DB/Quest: Learning to Communicate
* Conditions for The King's Empty Conch
* Scalders Abilities
* On Reward Text
2014-09-23 01:55:15 +01:00
Dr-J
fc11f7ed3a DB/Quest: Birds of a Feather
Fix this quest so it works as on retail

* Delete permament spawns of Female Kaliri Hatchling, 
* Breaking a egg will now spawn either a Female Kaliri Hatchling or Male Kaliri Hatchling
* Female Kaliri Hatchling will despawn when captured and is now required for quest item to be used.
2014-09-22 22:39:22 +01:00
DDuarte
878ffbc22a SQLs: Rename 434 only sql files 2014-09-22 20:28:31 +01:00
Vincent-Michael
15520e38d0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/dev/world_database.sql
	src/server/game/Entities/Player/Player.h
2014-09-22 06:41:14 +02:00
Malcrom
89423032ec DB/Creature Template: Fixed some startup errors. 2014-09-21 20:23:51 -02:30