Commit Graph

7039 Commits

Author SHA1 Message Date
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
Malcrom cc6e4d4608 Sripting/Blackrock Caverns: Start scripting for Blackrock Caverns 2014-09-21 19:05:59 -02:30
Malcrom dc814ed282 DB/Creature Model: Fix a few models by AriDEV 2014-09-21 13:18:14 -02:30
DDuarte d33c2952ad SQLs: Rename updates/world sql files to the new format 2014-09-21 16:26:20 +01:00
Dr-J ffa6e37abc DB/Misc: Remove more additem hacks
Use proper spells for creating items instead of sai action 56,  this leaves only NR items using this action to add items as data missing for spells.
2014-09-21 16:05:56 +01:00
Malcrom cd48ee01c0 Scripting/Shadowmoon Vally: Added scripting for Infernal Attackers. 2014-09-21 10:46:49 -02:30
Dr-J 9be609c49e DB/Misc: Remove some hacks for additem
* Replace sai to add some items with sai action 56 with correct spells to create items
* Add option and sai to replace Blood Elf Disguise for What Illidan Wants, Illidan Gets...
2014-09-21 12:51:05 +01:00
Vincent-Michael e592a7bdbb TDB 434.08 - 2014/09/21 2014-09-21 13:47:57 +02:00
Vincent-Michael 267e95dfe6 SQL: Only 4.3.4 2014-09-21 13:30:36 +02:00
Vincent-Michael 25c363e1d3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-21 13:29:29 +02:00
Vincent-Michael 69c1e0d758 TDB 335.56 - 2014/09/21 2014-09-21 13:26:27 +02:00
Vincent-Michael d29556ef89 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-21 12:12:47 +02:00
Vincent-Michael ef70382d5b SQL: Only 3.3.5a 2014-09-21 12:12:16 +02:00
Vincent-Michael 5061def422 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
2014-09-21 12:11:03 +02:00
Aokromes 793c56b8b7 DB/Creature: Delete 2 duplicate spawns 2014-09-21 10:23:58 +02:00
Vincent-Michael 076158e7a0 DB/Spells: Added missing EffectItemType stuff in spell_dbc table 2014-09-21 05:20:25 +02:00
Vincent-Michael c243bf96d4 DB/Spells:
- Added EffectItemType columns to spell_dbc table
- Fix "Create Bundle of Bloodthistle"
2014-09-21 04:18:31 +02:00
Dr-J df50d07567 DB/Misc: Fix gossip condition which was never met
Fix condition for gossip option 'Lend me a Windrider.  I'm going to Spinebreaker Post!' on Wing Commander Brack for when player has got quest http://www.wowhead.com/quest=10242/spinebreaker-post.

The existing condition quest taken (9) was never met as this quest is complete in players log as soon as taken, ie just turn in no other objectives, and even when player had quest in log gossip would never be displayed,
2014-09-21 01:35:02 +01:00
Malcrom cb9f7fce77 DB/Misc: Respawn Invis Infernal Caster, Wildhammer Defenders, Shadowmoon Scouts, and removed Infernals. 2014-09-20 21:57:36 -02:30
Vincent-Michael f767aef12e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Globals/ObjectMgr.cpp
2014-09-20 22:39:37 +02:00
Malcrom 72d08a146f DB/Misc: Add missing creature spawns to Invasion Point, Shadowmoon Valley with pathing 2014-09-20 17:11:20 -02:30