Commit Graph

1422 Commits

Author SHA1 Message Date
Shauren
3f3a32df34 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-23 14:51:52 +02:00
Vincent-Michael
180cd5cf6e Core: Fix warning 2013-06-23 01:49:28 +02:00
Vincent-Michael
7e01ac23db Scripts: Fix some typos 2013-06-22 17:24:23 +02:00
Vincent-Michael
e6185c92fc Scripts: Convert DoCast(me->GetVictim(), SPELL_XXXXX); in DoCastVictim(SPELL_XXX); 2013-06-22 16:53:13 +02:00
Vincent-Michael
15ef29800a Core: Fix build 2013-06-21 22:22:21 +02:00
Vincent-Michael
614e674b34 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Northrend/zone_zuldrak.cpp
2013-06-21 22:04:11 +02:00
Vincent-Michael
4a8e92e8af Core/GameEvent: Add log for game_event_creature/game_event_gameobject contains creature/gameobject not found in table creature/gameobject table 2013-06-21 21:56:16 +02:00
Vincent-Michael
a0fad6faa9 Core: Fix warnings and some cleanup 2013-06-21 18:06:38 +02:00
kaelima
a50fef2336 Scripts: Prevented several KilledUnit texts to yelled for non-players such as pets 2013-06-19 00:41:40 +02:00
Malcrom
3a30a0bb35 Core/Scripting: Some updates to Zul'Drak scripts. 2013-06-18 18:12:45 -02:30
Shauren
f517467817 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-18 21:04:31 +02:00
Shauren
89ec907539 Core/Objects: Refactored MovementInfo structure 2013-06-18 18:15:33 +02:00
Vincent-Michael
09eea66ee1 Core: Fix warnings 2013-06-18 16:51:56 +02:00
Shauren
b6aadc6698 Scripts/Misc: Use new movement flag setting methods in scripts 2013-06-18 16:48:46 +02:00
Malcrom
779f3c2f08 Core/Scripting: Updated Quest: Troll Patrol: The Alchemist's Apprentice scripting 2013-06-18 11:47:24 -02:30
Malcrom
2d892465d0 Core/Scripting: Remove double check. Thanks joschiwald 2013-06-17 21:36:52 -02:30
Malcrom
14695b056a Scripting: Quest: Troll Patrol: The Alchemist's Apprentice 2013-06-17 20:52:41 -02:30
Malcrom
86f2c84ee5 Script: Add proper spell to Lake Frog script. 2013-06-16 08:58:37 -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
fd0b9ebb8e Script: Fix a couple quest credit hacks. 2013-06-15 14:39:22 -02:30
Malcrom
08e7b15d9f Script: Fix errors in previous commit. 2013-06-15 14:19:29 -02:30
Malcrom
7b67351208 Script: Update Grizzly Hills Zone Script to use Events. 2013-06-15 14:10:26 -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
Malcrom
711809c58c Scripting: Added an overlooked enum. 2013-06-13 17:35:41 -02:30
Malcrom
8031aa4d40 Scripting: Update Lake Frog Script to use Events. 2013-06-13 17:28:43 -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
Vincent-Michael
1c9a3d5621 Scripted/Quest: Fix codestyle in 4065a8509f 2013-06-13 18:37:59 +02:00
Malcrom
8fb1e4e06c Scripting: Minor visual script fix. 2013-06-13 12:41:34 -02:30
Trinity
5a7d74ce87 Fix warning 2013-06-13 14:58: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
Malcrom
ec474a62e5 Core: More Function Renaming. 2013-06-11 21:25:12 -02:30
Malcrom
66978cfc3b Core: Some function renaming. 2013-06-11 19:54:27 -02:30
Malcrom
047608e7de Core/SAI: Add check so npc will not send text to pet. Also updated isPet() to IsPet(). 2013-06-11 18:39:51 -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
w1sht0l1v3
5f33bfb925 Core/Scripts: Fix Drake Hunt, closes #2005 2013-06-09 22:14:20 +03:00
Pitcrawler
fb28dcb3c4 DB/Quests: Fix The Explorer's League Outpost
Move a corescript to SAI
2013-06-09 18:10:03 +02:00
Vincent-Michael
872c0c9c73 Core Whitespace cleanup 2013-06-03 20:37:59 +02:00
Vincent-Michael
efb4fb4959 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
2013-06-03 18:19:18 +02:00
Vincent-Michael
216827201e Script/Ulduar: Fix try for Assembly Of Iron achievement "I choose you, xxx" 2013-06-02 23:16:18 +02:00
Shauren
1866c7a038 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-06-01 18:34:58 +02:00
Shauren
fb718d20aa Core/Scripts: Always run OnSpellClick AI hook, even if there are no spells defined for spellclick event. 2013-06-01 18:30:36 +02:00
Shauren
feb5ade2d7 Scripts/Icecrown Citadel: Fixed SMSG_PLAY_MUSIC structure used in The Lich King encounter 2013-05-31 22:22:20 +02:00
Shauren
adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
2013-05-30 20:57:07 +02:00
Shauren
80226fb38f Scripts/Halls of Reflection: Fixed a possible crash 2013-05-28 15:18:37 +02:00
Gacko
583d865c24 Script/Gundrak: Codestyle 2013-05-26 21:58:03 +02:00
xjose93
5a7cebe114 Scripts/Gundrak: Fix Gal'darah door. 2013-05-24 22:27:34 +02:00
Shauren
b688fc0ed5 Compile fix 2013-05-24 20:36:29 +02:00
Shauren
b8d75db4f1 Scripts/Halls of Reflection: Fixed gauntlet event 2013-05-24 20:06:58 +02:00
Shauren
fd0397cbd2 Scripts/Halls of Reflection: Fixed a few possible crashes and cleaned up the code a bit 2013-05-24 18:03:07 +02:00
Vincent-Michael
76e7ba886b Core: Fix logic fail in 77743ea13e 2013-05-24 17:28:17 +02:00