Commit Graph

5609 Commits

Author SHA1 Message Date
Shauren
de64f5d34f Core/Achievements: Fixed field type in *_achievement_progress tables 2013-06-20 14:28:32 +02:00
Shauren
e211d1bfe1 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-18 21:04:55 +02:00
Shauren
f517467817 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-18 21:04:31 +02:00
Vincent-Michael
99c256600a Core/Spells: Fix mage talent "Nether Vortex"
thx to @Souler for base script
2013-06-18 20:19:30 +02:00
Malcrom
779f3c2f08 Core/Scripting: Updated Quest: Troll Patrol: The Alchemist's Apprentice scripting 2013-06-18 11:47:24 -02:30
Malcrom
8e45081289 DB/SAI: Hut Fire SAI Quest: This Just In: Fire Still Hot! "Now looks more like Offi" 2013-06-18 00:15:33 -02:30
Malcrom
6f9d3b54e3 DB?Creature: Part fix for NPC Hut Fire for Quest: This Just In: Fire Still Hot! 2013-06-18 00:01:03 -02:30
Aokromes
07b2c89d75 DB/Misc: Cleaning db of unused/obsolete stuff 2013-06-18 05:22:49 +03:00
Aokromes
7f54297271 DB/Misc: Cleaning db of unused/obsolete stuff 2013-06-18 04:19:34 +03:00
Malcrom
14695b056a Scripting: Quest: Troll Patrol: The Alchemist's Apprentice 2013-06-17 20:52:41 -02:30
Pitcrawler
d163c58258 DB/Quests: Fix Reunited, Dark Horizon, closes #6246 closes #8979 2013-06-17 16:44:04 +02:00
kaelima
5d6d8e1c3f DB/Warden: Fix address check for multi-jump hacks
It was not long enough to detect eg. Hitchhikers Hack
2013-06-17 05:20:20 +02:00
Malcrom
9b4f14ca67 DB/Creature_text: Add texts for Alchemist Finklestein 2013-06-16 19:43:29 -02:30
Vincent-Michael
b21749a68c Core/Spells: Fix shaman talent "Feedback"
Note: For Chain Lightning need more fix
2013-06-16 23:00:54 +02:00
Malcrom
bb4efd78d5 DB/Misc: Some quest fixes for Zul'Drak. 2013-06-16 16:13:04 -02:30
Vincent-Michael
8c42b4ce8a Core/Spells: Fix shaman lava surge proc 2013-06-16 17:56:40 +02:00
Malcrom
ef1dca7dd8 DB/misc: Misc deletes as per Aokromes. 2013-06-16 13:25:50 -02:30
Malcrom
183358afd5 DB/Misc: Fix up previous push. 2013-06-16 12:50:48 -02:30
Malcrom
6a119f0671 DB/Misc: Some misc db fixes 2013-06-16 12:43:24 -02:30
w1sht0l1v3
f0cc3b1390 Fix sql naming on previous files.
Correct faction template for Nexus Drake Hatchling and initialize a variable in script.
2013-06-16 12:26:44 +03:00
Malcrom
e5dbf68897 DB/Creature template: Prevent cosmetic-drakkari-bat-ph from attacking players. 2013-06-15 23:30:41 -02:30
Malcrom
b3237630ec Script: Updated Murmur to use events. 2013-06-15 21:22:37 -02:30
Malcrom
40062cb227 DB?Gossip: Add missing gossip for Arathandris Silversky & Maybess Riverbreeze.
TODO: Add SAI and remove cpp script.
2013-06-15 19:28:45 -02:30
Malcrom
beed499770 Script: Update Boss_Grandmaster_Vorpil script to use events. 2013-06-15 19:03:09 -02:30
Vincent-Michael
b3f0d094b1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-14 23:44:46 +02:00
Vincent-Michael
9aea25f06c Scripts/ZulAman:
- Hard reset for old scripts
- Add pre Event (is not complete)
- Some cleanup
2013-06-14 23:39:02 +02:00
Malcrom
cecbb79a39 DB/SAI: Needs this too :) 2013-06-13 23:20:50 -02:30
Malcrom
7a6aef0f9f DB/SAI: Fix creature in botanica 2013-06-13 23:15:04 -02:30
Vincent-Michael
87d9d1d705 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/Spells/spell_pet.cpp
	src/server/scripts/Spells/spell_shaman.cpp
2013-06-13 19:35:01 +02:00
Malcrom
5f83c81ce5 DB/Creature: Redo spawning for entry 33211 "Lake Frog" 2013-06-13 12:08:21 -02:30
Aokromes
77dc4147d0 DB/Creature: Add missing lake frog spawns
By Vincent_Michael closes #10015
2013-06-13 16:15:33 +02:00
Pitcrawler
ca100a30f0 DB/Quests: Fix Convocation at Zul'Heb, closes #9122 2013-06-13 12:44:07 +02:00
Malcrom
4065a8509f Script: Add scripting for Quest A Blade Fit For A Champion
Still need pooled spawning for entry 33224. Aokromes has info if someone wants to do it.
2013-06-13 00:50:21 -02:30
Pitcrawler
2f771d4950 DB/Quests: Fix Badlands Reagent Run II, closes #9880
Thanks @joschiwald and @Kirkhammett
2013-06-12 21:15:17 +02:00
Pitcrawler
1dfda35221 DB/Quests: Fix Adding Injury to Insult, closes #3848
Improves b85e4eb724
2013-06-12 20:34:23 +02:00
Malcrom
8778f5abdf DB/SAI: Fix SAI for Sunseeker Harvester 2013-06-11 22:12:42 -02:30
Malcrom
e8d1501198 DB/Creature: Set Entry 18955 "Camera Shaker - 30-90 seconds" as trigger and remove random movement 2013-06-11 22:03:35 -02:30
Vincent-Michael
0bebf40fe7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp
2013-06-11 22:07:11 +02:00
Vincent-Michael
93c86b0c52 SQL: Add missing sql in old 3.3.5a file 2013-06-11 21:48:24 +02:00
Malcrom
935a1cf607 DB/SAI: Move Quel'dorei Magewraith from EAI to SAI. Added quest complete action to fix quest 9595.
closes #3047
2013-06-10 20:13:24 -02:30
Malcrom
cf8060f62d DB/Gossip: Complete gossip for Quarter Master Miranda Breechlock 2013-06-10 15:40:24 -02:30
Malcrom
dfb950af53 DB/SAI/Conditions: Add SmartAI to Quarter Master Miranda Breechlock to give player item when selecting I need another Argent Dawn Commission.
closes #6352
2013-06-10 12:36:15 -02:30
Vincent-Michael
86811d5d66 SQL: Fix sql import error 2013-06-09 20:37:42 +02:00
Pitcrawler
3e29d89a71 DB/Quests: Fix To Westguard Keep!
Add missing taxiflight gossip option
2013-06-09 18:39:33 +02:00
Pitcrawler
fb28dcb3c4 DB/Quests: Fix The Explorer's League Outpost
Move a corescript to SAI
2013-06-09 18:10:03 +02:00
Pitcrawler
1f785905d5 DB/Quests: Fix Danger! Explosives!, closes #6850 closes #9458 2013-06-08 16:21:24 +02:00
Aokromes
6149fcec9e Merge pull request #9983 from LeGuybrush/organize-
More organizing of sql/old, hooray!
2013-06-07 13:44:36 -07:00
LeGuybrush
7cec09dda5 More organizing of sql/old, hooray! 2013-06-07 16:27:20 -04:00
Vincent-Michael
fda3905799 DB/Creature: Fix startup error 2013-06-07 19:02:09 +02:00
Pitcrawler
1adf4624bb DB/Quests: Fix Foolish Endeavors, closes #1880 closes #9849
Thanks to @dr-j for a major part of the work!

Also rename a file.
2013-06-05 16:37:15 +02:00