Commit Graph
1506 Commits
Author SHA1 Message Date
Nay 2363552655 Scripts/ZG: Fix a warning and a compile error introduced in previous commit
Personal opinion: BossAI should not have a public field named "instance"
2013-01-21 02:24:25 +00:00
Nay c6c23d67b8 Scripts/ZG: Fix some code style issues and logic errors 2013-01-21 02:10:01 +00:00
Malcrom 33b7685696 Scripting/ZulGrub: Fix last commit 2013-01-20 18:20:46 -03:30
Malcrom b7dbc8d746 Scripting/Zulgrub: Updated Boss Arlokk Script. 2013-01-20 18:04:06 -03:30
Vincent_Michael ed44eea699 Core: Fix warnings 2013-01-19 20:28:29 +01:00
Vincent_Michael 0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Malcrom b115abde31 Script/Scholomance: Update Kirtonos the Herald script. 2013-01-17 19:50:11 -03:30
Spp 7d6634e363 Fix merge problem 2013-01-17 08:48:04 +01:00
Spp 0e8011657d Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
Warpten faccbef869 Scripts/ZulGurub: I can do this!
Commiting stuff one hour after waking up is no good.
2013-01-16 07:18:47 +01:00
Warpten 3df4075a04 Scripts/ZulGurub: Fixed Hakkar's aspects. 2013-01-16 07:16:22 +01:00
Warpten 797be8d9ff Scripts/ZulGurub: Missing mass replace changes and typo/codestyle fixes. 2013-01-16 07:07:48 +01:00
Warpten 26bf10365e Scripts/ZulGurub: Forgotten change to previous commit. Damned Ctrl+S. 2013-01-16 06:55:46 +01:00
Warpten 803bf2f9cc Scripts/ZulGurub:
* Fixed non-PCH compile.
* Changed some codestyle on Mandokir.
* Fixed compile warnings and a few typos.
* Remove instance checks and use a wrapper to get AIs.
2013-01-16 06:51:59 +01:00
Malcrom ace7bbeddf Core/Zul'Grub: Fix up Mandokir Boss 2013-01-16 00:41:03 -03:30
Malcrom b138d7fdf4 Core/Scripting: Bosses should now work in ZG.
Note: Mandokir is being rewritten blizzlike and not everything is working properly yet.
2013-01-15 13:23:33 -03:30
Spp 0d5cb6af75 Core/Misc: Apply codestyle to multiple files (II) 2013-01-14 11:12:58 +01:00
Spp d75222feca Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
2013-01-14 11:04:03 +01:00
Spp 802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Malcrom 83c753f607 Core/Scripting: more Zul'Grub updates 2013-01-13 20:58:48 -03:30
Malcrom 114617fcb0 Core/Scripting: Fix build 2013-01-13 19:59:09 -03:30
Malcrom 0759f6c910 Core/Scripting: More Zul'Grub updates 2013-01-13 19:48:25 -03:30
Malcrom 0a4cfd04bb Core/Scripting: Update boss Mar'li script 2013-01-13 17:42:16 -03:30
Malcrom 63488f3a86 Core/Scripting: Fix Zul'Grub Instance 2013-01-13 17:23:46 -03:30
Malcrom cdafb60f0c Core/Scripting: Clean up boss Jin'do 2013-01-13 15:05:31 -03:30
Malcrom 71bfda55c3 Core/Scripting: Improve boss Thekal script and misc cleanup. 2013-01-13 13:44:11 -03:30
Malcrom a47164b3dd Core/Scripting: Update script for boss thekal, Zul'Grub 2013-01-13 12:08:40 -03:30
Gacko 0b07912622 Fix nonpch build and warning. Move script to spell_quest.cpp 2013-01-13 15:37:01 +01:00
Malcrom 7abdab74ef Core/Scripting: Some updates to Zul'Grub 2013-01-13 09:52:43 -03:30
Gacko fdd853366a Core/Script: Uldaman - Altar of the Keepers
... and some codestyle changes.
2013-01-13 11:54:05 +01:00
Malcrom d7383717ea Core/Scripting: Misc Cleanup. 2013-01-13 01:38:28 -03:30
Malcrom 0fe10ce283 Core/Scripting: Updates to Zul'Grub Instance. 2013-01-13 01:07:35 -03:30
Vincent_Michael bf7f58365f Scripts/Misc: Some cleanups 2013-01-12 19:35:32 +01:00
Vincent_Michael cc5e40e8ee Scripts/Scholomance: Fix warning 2013-01-12 13:54:14 +01:00
Gacko f46ac4a46c Core/Script: Pyroguard emberseer
Cleanup while working on #4586
2013-01-12 13:44:26 +01:00
Vincent_Michael 66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
2013-01-11 19:10:10 +01:00
Malcrom ddea01290c Core/Scriptd: Rewrite :) 2013-01-10 20:50:32 -03:30
Malcrom 0b50520df7 Core/scripting: Updating Scholomance scripts 2013-01-10 20:08:30 -03:30
Warpten c9650de789 Scripts/ZulAman: Fixed a crash caused by the grid.
Closes #8885.
2013-01-10 10:41:46 +01:00
Spp 677ed18080 Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
2013-01-09 15:15:42 +01:00
Vincent_Michael db330750b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
2013-01-08 16:32:54 +01:00
Malcrom 7c5597a697 Core/Scripting: Update Scholomance Scripts 2013-01-08 00:47:20 -03:30
Malcrom f81f8ec41b Core/Scripting: Compile fix 2013-01-07 23:02:17 -03:30
Malcrom 43d73bebd0 Core/Scripting: Some cleanup 2013-01-07 22:48:40 -03:30
Malcrom 2a9fc5198b Core/Scripting: Move Nightbane text to creature text 2013-01-07 22:44:09 -03:30
Malcrom 0226048686 Core/Scripting: Update Script for Postmaster Malown 2013-01-07 22:13:04 -03:30
Malcrom 0105bc849f Core/Scripting: Misc clean up and a warning fix 2013-01-07 21:47:38 -03:30
Malcrom 70977f3097 Core/Scripting: Misc fixes 2013-01-07 20:18:47 -03:30
Malcrom 5ce88118ee Core/Scripting: Move Text for Timmy the Cruel to creature text 2013-01-07 19:27:35 -03:30
Vincent_Michael 8f36383d39 Core: Fix build 2013-01-07 23:28:03 +01:00