Vincent_Michael
224b4480a7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-16 23:43:07 +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
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
65cd79dc77
Core/Misc: Update headers to 2013
2013-01-14 17:42:06 +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
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
Malcrom
1993544103
Core/Scripting: More updates to Mechanar
2013-01-12 14:04:25 -03:30
Gacko
4d9fa7f22c
Core/Spell: Gordunni Trap
...
Casting npc of the trap should not remove the summoned chest on despawn.
Solves #4811
2013-01-12 15:01:53 +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
Malcrom
0b6997b8af
Core/Scripting: Move Boss_Gatewatcher_Gyrokill to c++ scripting. Additional cleanup in Mechanar.
2013-01-12 00:14:12 -03:30
blub
41817bc259
Merge pull request #8917 from joschiwald/spellscripts_reorder2
...
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-11 17:50:48 -08:00
Vincent_Michael
7fbd6d33dd
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-12 02:38:34 +01:00
joschiwald
95f8068a6f
Misc: Reorder more scripts in some script files and some cosmetic stuff
2013-01-12 02:16:30 +01:00
Vincent_Michael
2fcd4c381c
DB/Conditions: Convert shadowstep spell script in conditions
2013-01-11 23:37:54 +01:00
Vincent_Michael
d6d2cb0490
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2013-01-11 14:58:57 +01:00
Vincent_Michael
ecbcca8794
Core: Whitespace cleanup
2013-01-11 14:49:38 +01:00