Shauren
504ca4105a
Scripts/Firelands: Fixed compile without PCH
2013-01-19 13:05:20 +01:00
Vincent_Michael
c6ef4b1047
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-19 01:03:31 +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
Vincent_Michael
224b4480a7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-16 23:43:07 +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
Vincent_Michael
11bd11badc
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-15 23:34:50 +01:00
Vincent_Michael
9391d087fd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-15 23:33:36 +01:00
w1sht0l1v3
fc05b3dc58
Core/Scripting: Implement quest Reconnaissance Flight (id 12671)
...
Fix sql naming for last file.
2013-01-15 21:56:20 +02:00
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
Vincent_Michael
6f8aa6a782
Core/Spells: Reorder more scripts in some script files and some cosmetic stuff
2013-01-14 20:28:32 +01:00
Vincent_Michael
65cd79dc77
Core/Misc: Update headers to 2013
2013-01-14 17:42:06 +01:00
Shauren
9007ef905f
Core: Fixed some compile warnings
2013-01-14 15:05:30 +01:00
Nay
e6a07076c3
Merge remote-tracking branch 'origin/master' into mmaps
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-14 13:58:34 +00:00
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
kaelima
557fde86e4
Script/Ruby Sanctum: Miss in a05e78bb18 Thanks joschiwald
2013-01-14 04:38:05 +01:00
kaelima
a05e78bb18
Script/Ruby Sanctum: Some cleanup and minor fixes
...
Solves #8573
Closes #8490
2013-01-14 02:40:24 +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
Vincent_Michael
b06c7e7785
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-13 23:41:45 +01:00
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
Gacko
3a32c76de9
Core/DB: Gluttonous Lurkers
...
Solves #1249
2013-01-13 14:59:51 +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
blub
673a85e183
Merge pull request #8928 from joschiwald/spellscripts_reorder3
...
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-12 18:19:55 -08:00
joschiwald
2f1bbb2c7a
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-13 02:41:40 +01:00
Vincent_Michael
b08ea19aff
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-13 01:25:56 +01:00
Vincent_Michael
abe4b656c8
Scripts/Mechanar:
...
* cleanup for door system
* Convert mechano lord capacitus in c++
2013-01-13 01:07:11 +01:00
Malcrom
df2e54f587
Core/Scripting: More cleanup to Mechanar scripts. Added missing doors and handling to instance.
2013-01-12 19:35:14 -03:30
Vincent_Michael
bf7f58365f
Scripts/Misc: Some cleanups
2013-01-12 19:35:32 +01:00
Nay
9d1e5a013e
Core/Ticket: Fix unassigned message not showing who was assigned to ticket
...
Thanks to @Bezo
Closes #8923
2013-01-12 18:16:02 +00:00
Vincent_Michael
a02fa868a8
Core: Fix build
2013-01-12 19:01:49 +01:00
Vincent_Michael
84cdd538bb
Core/Commands: Fix sql warnings with pinfo at ban players
2013-01-12 18:52:51 +01:00
