Commit Graph

5988 Commits

Author SHA1 Message Date
Xanvial 01178f5958 Core/Spells: Fix paladin talent "Grand Crusader"
Closes #9072

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
2013-08-16 00:04:52 +02:00
Vincent-Michael 443940c084 DB/Spells: Fix shaman talent "Tidal Waves" drop charges with effect 1 2013-08-15 22:41:53 +02:00
Vincent-Michael 21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00
Shauren 4d260a54ae Core/Spells: Fixed warrior T10 4p dps bonus
Closes #493
2013-08-15 16:39:31 +02:00
Vincent-Michael 0e966c11e2 SQL: Add missing newline in 5890f95f7c 2013-08-15 16:21:31 +02:00
Kirkhammett 43c218ad21 [DB/SAI]: Lumber Hack (12050) 2013-08-15 15:59:18 +02:00
Kirkhammett e0e236967b Revert "Lumber Hack (12050)"
This reverts commit 40ec7f7979.
2013-08-15 15:56:44 +02:00
Kirkhammett 40ec7f7979 Lumber Hack (12050)
Fixes #4560
2013-08-15 15:55:19 +02:00
Vincent-Michael 8b0cec3d55 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Spells/SpellInfo.cpp
2013-08-15 08:13:08 +02:00
Discover- 8c961687a0 Core/SmartAI: Implement SMART_EVENT_FRIENDLY_HEALTH_PCT.
On current clean TDB, there are a total of 106 creatures using
   SMART_EVENT_FRIENDLY_HEALTH (non-PCT) which has a flat first parameter, but
   only 8 of these use the event correctly (and therefore only 8 of them
   actually work).

Closes #10520
2013-08-15 01:18:10 +01:00
ZxBiohazardZx 22d07db886 DB/commit: the mining is also useable for 434, thus removed the _335 tag 2013-08-15 01:04:29 +02:00
Vincent-Michael 65e345dab7 DB/Gameobject: Spawn or respawn missing or bad spawned gameobjects "Coldwind Tree" / "Poster Knife" 2013-08-14 20:21:11 +02:00
Vincent-Michael 595fcdee70 Scripted/BaradinHold: Add missing door for Alizabal 2013-08-14 19:48:53 +02:00
Vincent-Michael 73be61bb83 SQL: Fix import error 2013-08-14 17:25:26 +02:00
ZxBiohazardZx fa10737861 DB/Loot: while at it also did the mining veins 2013-08-14 17:11:17 +02:00
Vincent-Michael 11ecb9c633 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
2013-08-14 16:52:13 +02:00
ZxBiohazardZx 5890f95f7c DB/Loot: Fix some horrible loot definitions for Herbalism, reworked ALL Herbs 2013-08-14 16:11:22 +02:00
Vincent-Michael c8b722e4a4 Scripted/BaradinHold: Implemented Occu'thar 2013-08-14 13:36:07 +02:00
Vincent-Michael 617e0c476b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_hunter.cpp
2013-08-12 13:36:42 +02:00
joschiwald de27cfd102 DB/Spells: Fix Rune Strike
Closes #6514
2013-08-12 01:54:15 +02:00
Vincent-Michael ca78aff37f SQL: Fix import error 2013-08-11 21:15:21 +02:00
Vincent-Michael d394d380c6 DB/Misc: Fix startup error wit eai 2013-08-11 21:13:07 +02:00
Vincent-Michael 4c64e407b7 Core/Spells: Convert hunter "Improved Mend Pet" in spell script
Closes #5597
Closes #9006
Closes #10346
2013-08-11 19:23:21 +02:00
Vincent-Michael f506ee3077 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
2013-08-11 18:37:31 +02:00
Discover- 3d1c549aa4 DB/EAI: Fix some typos in EAI scripts
We are updating EAI scripts so the conversion to SAI is correctly done
2013-08-11 16:02:17 +01:00
Vincent-Michael 9e45731f32 Scripted/ToC5: Add missing stuff in c0bf535e5b 2013-08-11 11:51:59 +02:00
Vincent-Michael 2e9547b4ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
2013-08-11 00:27:54 +02:00
Kirkhammett 0161012c69 Scripts/ZulFarrak: Convert Witch Doctor Zum'rah from SAI to Cpp
Closes #10508
2013-08-10 20:36:45 +01:00
Vincent-Michael bd4155bd5c DB: Rename sql file for only 335 2013-08-10 20:51:02 +02:00
Vincent-Michael c2ae39685b DB/Misc: Fix logic fail in f23069e324 2013-08-10 20:13:24 +02:00
Vincent-Michael f23069e324 DB/Misc: Fix startup error 2013-08-10 20:07:47 +02:00
Nay 181a3cad00 Merge pull request #10511 from MitchesD/Mobs
DB/SAI: Draktharon Keep mobs
2013-08-10 11:05:48 -07:00
MitchesD e90d18af31 DB/SAI: Draktharon Keep mobs 2013-08-10 20:04:23 +02:00
Vincent-Michael bb9614d00d 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/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
2013-08-10 17:58:53 +02:00
Discover- 488128bada DB/EAI: Fix unit_field changes, outdated since initial 3.x versions 2013-08-10 16:31:52 +01:00
Vincent-Michael ba6e62fd6e Scripted/BaradinHold: Implemented Pit Lord Argaloth
Note: Need some update with sniff
2013-08-10 16:35:06 +02:00
Vincent-Michael 99aa4649d2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/CMakeLists.txt
2013-08-09 20:02:21 +02:00
joschiwald 8c7db6cc8d DB/Spells: Rename LoS for spell Rod of Purification
Ref #1972
2013-08-09 18:38:15 +01:00
sonic3000 0a7fa02525 DB/SAI: Script NPC Arch Mage Xintor
Closes #1743
2013-08-09 18:35:17 +01:00
malcrom f62a7f7523 DB/SAI: Fix quest "Where in the World is Hemet Nesingwary?"
Script NPC Archmage Pentarus

Closes #921
2013-08-09 18:35:16 +01:00
nelegalno 13f68e100c DB/GO: Increase radius of Mystery of the Infinity gameobject spellfocus
Closes #920

(Quest is still broken; being worked on)
2013-08-09 18:35:16 +01:00
Vincent-Michael dbb40dd4fe Scripted/Pets: Move some player pets in pet_xxx.cpp 2013-08-09 19:22:16 +02:00
Kirkhammett 15696e29dd DB/SAI: Scripts for Onslaught NPCs
Closes #10500
Closes #4741
2013-08-09 15:43:30 +01:00
Nay 32c8555e1e DB/NPCs: Remove AIName from npcs that do not have EAI or SAI scripts
Closes #10483
2013-08-09 14:21:34 +01:00
untaught 92fdb7aed1 DB/SAI: Fix quest Jormuttar is Soo Fat...
Scripts/Spells: Script spell Bear Flank Master

Closes #10484
2013-08-09 12:55:26 +01:00
dr-j d39d9f8328 DB/SAI: Fix quest "Tokens of the Descendants"
Closes #10437
2013-08-09 12:44:04 +01:00
untaught 011c7d465b DB/SAI: Fix quest "Blood in the Water"
Closes #10398
2013-08-09 12:42:35 +01:00
dr-j d520a4e994 DB/Cond: Fix taking of 8280 Securing the Supply Lines for horde players
Closes #10371
2013-08-09 12:38:49 +01:00
dr-j 879725ed89 DB/SAI: Fix infinite spawn in quest "You Are Rakh'Likh, Demon"
Closes #10361
2013-08-09 12:32:19 +01:00
Nevadas 6c51deab80 DB/SAI: Fix quest The Conquest Pit
Original fix by @shlomi1515

Closes #10332
Ref #3913
2013-08-09 12:30:14 +01:00