Commit Graph

17968 Commits

Author SHA1 Message Date
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
Vincent_Michael
c9ec5b4ce8 DB/Game Event: Update some game events start time for 2013 2013-01-14 12:07:37 +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
Kaelima
c6f5bef468 Merge pull request #8906 from ille/GridLock
Core/Maps: separate mutex for grid
2013-01-13 17:35:59 -08: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
Nay
d4398eaafe TDB 335.50 - 2013/01/14 TDB335.50 2013-01-13 18:53:32 +00:00
Malcrom
cdafb60f0c Core/Scripting: Clean up boss Jin'do 2013-01-13 15:05:31 -03:30
Nay
bc0646e190 DB/Conditions: Fix DB startup errors
Thanks @vlad852
Related to d77904e0af
2013-01-13 18:18:26 +00:00
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
Spp
4c247f5d2d Core/Dungeon finder: Fix teleport out after dungeon is finished
Closes 8914
2013-01-13 16:22:41 +01:00
Gacko
8be3d4cc80 Core/BG: Add workaround annotation and use exact coords 2013-01-13 16:15:35 +01:00
kaelima
c54fb9efb4 Core/BG: Corrections to cf5058c4e3 2013-01-13 15:43:32 +01:00
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
Kirkhammett
d77904e0af DB/SAI: Fix quest Parting Gifts
Closes #8926
Closes #7804

Signed-off-by: Nay <dnpd.dd@gmail.com>
2013-01-13 13:55:17 +00: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
Nay
03df612645 DB/Wps: Fix one last DB startup error related to waypoint_scripts 2013-01-13 03:02:36 +00:00
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
Nay
32e08bcd12 Tools/Extractor: Fix yet another typo in ADT. Fixes extracting.
Closes #8900
2013-01-13 02:11:21 +00: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
4fb60031f8 DB/Waypoints: Fix waypoints for Mechano-Lord Capacitus 2013-01-12 20:16:16 -03:30
Malcrom
df2e54f587 Core/Scripting: More cleanup to Mechanar scripts. Added missing doors and handling to instance. 2013-01-12 19:35:14 -03:30
Gacko
26aeed3744 Once last codestyle change. 2013-01-12 20:33:08 +01:00
Gacko
31043b1ae3 Fix codestyle in da21bbe93c 2013-01-12 20:29:40 +01:00
Gacko
da21bbe93c Core/Battleground: Eye of Storm - Fel Reaver Ruins
Make it possible to deliver the flag at Fel Reaver Ruins which was
impossible before because of a big areatrigger which covered the original
areatrigger for the flag point.

Solves #337. Thanks to @Greymane
2013-01-12 20:28:12 +01:00
Vincent_Michael
9e91bcfe40 SQL: Fix "No newline at end of file" in bf7f58365f 2013-01-12 19:38:48 +01:00
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
f739be5052 Core/UnitAI: Checks in DoCastVictim
Consider triggered flag and unit state
2013-01-12 13:47:32 +01:00
Gacko
f46ac4a46c Core/Script: Pyroguard emberseer
Cleanup while working on #4586
2013-01-12 13:44:26 +01:00
w1sht0l1v3
d8b2954507 Core/Tickets: Allow viewing of ticket response(if any) when using .ticket viewid or .ticket viewname.
Fix an sql name.
2013-01-12 14:26:30 +02:00