Commit Graph
1506 Commits
Author SHA1 Message Date
Vincent-Michael ece52c11d2 Core: Fix build 2013-06-30 13:00:39 +02:00
Malcrom 4ed70c7094 Core/Scripting: A few fixes for Blackrock Spire. Emberseer now setting properly after wipe and Gyth/Rend event is getting closer to complete. 2013-06-30 00:24:01 -02:30
Vincent-Michael 676c7341d6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
2013-06-30 00:36:03 +02:00
Krzysztof Rapacki 75f535c65e Scripts/Blackwing Lair: Fixed out of bounds array access 2013-06-27 09:45:49 +02:00
Aokromes 9ea2b218cb Core/Scripting: Typo fix 2013-06-27 03:23:23 +02:00
Malcrom 651a966e92 Core/Scripting: More BRS updates. Emberseer is still buggy if player resets. Working on it. 2013-06-26 15:38:19 -02:30
Aokromes 563c75c3e9 Core/Scripting: Typo fix 2013-06-26 10:36:10 +02:00
Malcrom caa214d396 DB/Creature_text: 2013-06-26 01:18:12 -02:30
Vincent-Michael 6c9e810a63 Core: Fix warnings 2013-06-25 20:49:51 +02:00
Vincent-Michael 711c68d3f3 Core: Fix non pch build 2013-06-25 20:16:54 +02:00
Malcrom 1149292fe1 Core/Scripting: More fixes and updates for BRS Instance. 2013-06-25 15:36:16 -02:30
Malcrom 60159297f2 Core/Scripting: Gyth / Rend Event in progress. Pushing before Vincent Micheal makes ninja changes. 2013-06-25 00:15:41 -02:30
Malcrom 2f746d929a Core/Scripting: Emberseer event will now check to see if all players in instance are clicking altar. 2013-06-24 18:06:23 -02:30
Vincent-Michael 72c2a8cfa6 Core: Fix warnings 2013-06-24 18:59:59 +02:00
Vincent-Michael b43688b684 Core: Fix non pch build 2013-06-24 18:33:40 +02:00
Malcrom c31791493f Core/Scripting: Forgot a couple line endings. 2013-06-24 13:55:03 -02:30
Malcrom eb74361470 Core/Scripting: Updated BWL Scripts. Thanks to gerripeach for the base.
Closes #4952 #9283
2013-06-24 13:48:02 -02:30
Malcrom 9726a5174e Core/Scripting: Start Scripting Gyth / Rend event for UBRS. Add creature text. 2013-06-24 03:47:44 -02:30
Vincent-Michael 7d429145eb Core: Fix non pch build 2013-06-24 06:37:56 +02:00
Malcrom fc4652964e Core/Scripting: A few updates. 2013-06-24 01:26:58 -02:30
Malcrom d791515502 Core/Scripting: Hopefully this calms tcbuid. 2013-06-24 00:34:37 -02:30
Malcrom dc55188edd Core/Scripting: I hate you tcbuild. 2013-06-23 23:34:36 -02:30
Malcrom d9c819a65d Core/Scripting: tcbuild is being a bitch and SD2 had nothing to do with this script. 2013-06-23 23:07:08 -02:30
Malcrom a6711d5232 Core/Scripting: Update to Boss Emberseer Script. 2013-06-23 22:46:44 -02:30
Malcrom 9c0024d067 Core/Scripting: UBRS Boss Pyroguard Emberseer now scripted. 2013-06-23 22:22:40 -02:30
Malcrom 1a576fa7b2 Core/Scripting: UBRS Boss Pyroguard Emberseer closer to being fully scripted. 2013-06-23 16:16:42 -02:30
Malcrom bb5ef1b462 Core/Scripting: Fix warning 2013-06-23 11:47:08 -02:30
Malcrom 7c19fb8d0e Core/Scripting: Runes in UBRS Dragonspire Hall now activate and open door.
Closes #4414
2013-06-23 11:32:57 -02:30
Malcrom b669a2142e Core/Scripting: Some boss script fixes. 2013-06-23 11:27:33 -02:30
Shauren 6bccfe997c Merge fixups 2013-06-23 15:11:08 +02:00
Shauren 3f3a32df34 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-06-23 14:51:52 +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
Malcrom 1b8973a5ac Core/Scripting: Fix previous commit 2013-06-22 01:01:51 -02:30
Malcrom f22e1508f6 Core/Scripting: Update Boss Akilzon Script to use Events 2013-06-22 00:47:41 -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
Shauren b6aadc6698 Scripts/Misc: Use new movement flag setting methods in scripts 2013-06-18 16:48:46 +02:00
Aokromes 74d828aa81 Core/Scripting: Cleaning of unused/obsolete stuff 2013-06-18 06:27:15 +03:00
Vincent-Michael 31b0b1afb8 Scripts/ZulAman: Add emote for creature_text 2013-06-15 23:58:48 +02:00
Vincent-Michael 11ad7aac86 Scripts/ZulAman: Fix non pch build and warnings 2013-06-15 00:03:45 +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
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 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
Shauren 7d64b56db1 Core/PacketIO: Fixed SMSG_PLAY_SOUND structure 2013-06-01 17:49:33 +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
Spp 9664c0ab5c Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-30 13:18:29 +02:00
Spp ec0688ade3 Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
2013-05-21 11:27:12 +02:00