Commit Graph

5115 Commits

Author SHA1 Message Date
Machiavelli
ef9a1985e9 *Merge
--HG--
branch : trunk
2009-08-17 01:43:26 +02:00
Machiavelli
fa20274a91 *Merge
--HG--
branch : trunk
2009-08-17 01:42:33 +02:00
Kudlaty
55087b5e72 Merge [SD2]
r1331 Delete old .patch files no longer needed. - skip
r1332 Clean up script for end boss in TK and apply SD2 code style. Patch by Abim - skip
r1333 Remove workaround ai's and correct spells to be casted for Flame Strike - skip
r1334 Add misc gossip for npc_timothy_daniels and npc_trollbane. Patch by hoshie
r1335 Correct order of dwarf attack for BRD seven event. Also add missing text and remove wrong gossip. Patch by jotapdiez - skip
r1336 Add support for quest 12573. Patch by Azuritus
r1337 Set eol-style where missing, since i have no fantasy to do other changes for a l33t revision. - skip
r1338 Trim trailing whitespace in files. - skip
r1339 Fix my mistake in rev 1336 and add script where it should be.
r1340 Correct inconsistent use of line endings and set eol-style to custom patch. - skip

--HG--
branch : trunk
2009-08-17 01:41:39 +02:00
Machiavelli
60c0acfae6 * Fix a bug; prevent server from deleting action button of the talent spec that was just switched to, caused by clients response when spells are being unlearned.
--HG--
branch : trunk
2009-08-17 01:40:35 +02:00
Anubisss
5764feb2cf *Fix a typo. By Necroo.
--HG--
branch : trunk
2009-08-17 01:14:30 +02:00
Kudlaty
48e6997453 Revert last rev and fix in correct way. Also some clean up after merge
--HG--
branch : trunk
2009-08-17 01:10:34 +02:00
megamage
418b161bdc *Fix build.
--HG--
branch : trunk
2009-08-16 18:03:26 -05:00
Kudlaty
bf13d2d5aa Apply one more time rev 5104 cos its removed by merge
--HG--
branch : trunk
2009-08-17 00:37:32 +02:00
Kudlaty
b08bd25bc5 merge
--HG--
branch : trunk
2009-08-17 00:34:14 +02:00
Kudlaty
cad925e31d Merge [SD2]
r1326 Correct waypoints and details for quest 863
r1327 Add function GetPlayerForEscort to escortAI (not used by escortAI yet)
r1328 Updated 0.12 patch and redesigned Karathress for better maintenance. Fixed an issue with Karathres's speech and a little casting bug. - skip
r1329 Remove use of old uint64 variable for player guid in escortAI and use function to retrieve pointer to player instead.
r1330 Restore compile and use FailQuest instead of no longer existing FailTimedQuest (ref Mangos 8355).

Move all waypoints to db

--HG--
branch : trunk
2009-08-17 00:29:53 +02:00
megamage
bf3928d163 *Fix endless hunger quest.
--HG--
branch : trunk
2009-08-16 16:54:31 -05:00
maximius
68e0c6fcbd *Just in case this gets run twice without recreating npc_option..
--HG--
branch : trunk
2009-08-16 14:36:56 -07:00
megamage
a6dd58f875 *Add two missing files.
--HG--
branch : trunk
2009-08-16 16:36:07 -05:00
megamage
7ca0f5b721 *Fix the crash caused by client customize log.
--HG--
branch : trunk
2009-08-16 16:32:11 -05:00
megamage
188a814457 *Replace 4 spaces with tabs in vcproj files. Please use tabs in the future. 4 spaces should only be used in cpp files.
--HG--
branch : trunk
2009-08-16 16:24:19 -05:00
megamage
0bf3aa109f *Some quest fixes for some dk quests. Not enabled for now. By Azrael and ckegg. sql will be added later so you may get some console error during start up.
--HG--
branch : trunk
2009-08-16 16:20:31 -05:00
maximius
73b2226827 *Hopefully this should be the last of the talent/skill cleanup, thanks Drethek and XTElite1 :)
--HG--
branch : trunk
2009-08-16 13:30:27 -07:00
Kudlaty
5d2d8d8074 Merge [SD2]
r1321 Add support for quest 863.
      Some cleanup in existing script.
r1322 Correct database info for current supported Mangos revision (8273+) (Windows may use from 8190+) - skip
r1323 Make escortAI function IsPlayerOrGroupInRange and move existing code to this.
r1324 Fixed IsEncounterInProgress for Arcatraz, The Eye and Shadow Labyrinth
r1325 Renamed aunchindoun to auchindoun. Fixed comment typos.

--HG--
branch : trunk
2009-08-16 22:21:57 +02:00
Kudlaty
91f3d69edf Merge [SD2]
r1314 Correct some spellId's and apply SD2 code style
r1315 Correct more spells and apply SD2 code style
r1316 Replace magic number with enum type name UNIT_DYNFLAG_DEAD
r1317 Add support for quest 1249. Patch by jotapdiez
r1318 Move AI's implementation from headers. Original patch/idea by DasBlub
r1319 Convert script related to quest 938 to use followerAI
r1320 Add new virtual function WaypointStart() to escortAI.

--HG--
branch : trunk
2009-08-16 21:46:31 +02:00
Kudlaty
81ee07fa2a Merge [SD2]
r1313 Implement new class SystemMgr for storage and management of script data.
      Move database load to new class and instead use functions in class to retrieve data from storage.

--HG--
branch : trunk
2009-08-16 19:38:18 +02:00
QAston
ec5515ee49 *Remove hack in Brain Freeze code.
*Update Improved Mend Pet to 3.1.3.

--HG--
branch : trunk
2009-08-16 19:13:02 +02:00
Kudlaty
a4b91e2cc4 Merge [SD2]
r1311 Move SetData from Reset to JustReachedHome for channelers and boss.
r1312 Added class for FollowerAI. Note this is under development and may have issues in some situations.
      FollowerAI is generally to be used for escort quests where NPC follow leader instead of using a predefined path.

--HG--
branch : trunk
2009-08-16 18:34:45 +02:00
Kudlaty
9ddfd5bf22 Merge [SD2]
r1307 Add gossip for npc_tracy_proudwell. Patch by hoshie
r1308 Fixed one not initialized array.
r1309 Correct typo in folder name. - skip
r1310 Enable faction change and remove unitState at attackStart for script related to quest 1560

--HG--
branch : trunk
2009-08-16 17:54:31 +02:00
Kudlaty
6838486796 Merge [SD2]
r1306 Remove now empty zone folder and complete re-organize file/folder structure. Thanks to DasBlub, Zor and others for inspiration, help and suggestions.

--HG--
branch : trunk
2009-08-16 17:30:05 +02:00
Kudlaty
982dcc9eaa Merge [SD2]
r1305 Move source files to continent folder, part 3

--HG--
branch : trunk
2009-08-16 17:22:17 +02:00
Kudlaty
6e9ee95bb7 Merge [SD2]
r1304 Move source files to continent folder, part 2

--HG--
branch : trunk
2009-08-16 16:29:41 +02:00
Kudlaty
2c663c945a Merge [SD2]
r1302 Create folder structure for sorting instance by continent and move empty folders. - skip
r1303 Start move source files to new folders, sorted by continent.

--HG--
branch : trunk
2009-08-16 15:49:51 +02:00
Anubisss
b3d381791e *Dont allow function CompletedAchievement() for GMs if GM.AllowAchievementGain disabled in conf.
--HG--
branch : trunk
2009-08-16 14:30:40 +02:00
maximius
eb125d11b6 *Quicksort
--HG--
branch : trunk
2009-08-16 04:27:21 -07:00
maximius
2ffcd76b43 *Merge rockzOr and oc_redfox's talent lists, it seems they both missed some.. resorted with quicksort
--HG--
branch : trunk
2009-08-16 04:24:02 -07:00
maximius
f74e8473a1 *Added oc_redfox's dual spec talent cleanup fix, run sql/updates/5084_character_updates_dual_spec.sql manually to cleanup talents, see file for details
--HG--
branch : trunk
2009-08-16 03:50:12 -07:00
megamage
90ed27059d *Script of quest Massacre at light's point. Original author nevan.
*primary bugs:
*you may fall below the deck of ship after exiting mine car and have to try again.
*mobs spawn too slow (part of it is db issue)
*there is no cannon on ship (db issue, you can add some 28833 by yourself or ask your db dev to do it)

--HG--
branch : trunk
2009-08-15 23:04:21 -05:00
megamage
95a79b2815 *Restore the work of escortAI::AddWaypoint.
--HG--
branch : trunk
2009-08-15 22:58:17 -05:00
megamage
9f3d1a4a3b *Fix the bug that player sometimes take fall damage when exit vehicle.
--HG--
branch : trunk
2009-08-15 22:48:52 -05:00
maximius
f2a22871a2 *More cleanup :)
--HG--
branch : trunk
2009-08-15 19:18:30 -07:00
maximius
53bc13fad8 *Cleanup
--HG--
branch : trunk
2009-08-15 19:16:47 -07:00
maximius
e581351794 *Replace every tab with 4 spaces, checked by hand
--HG--
branch : trunk
2009-08-15 19:08:39 -07:00
megamage
c88304af95 *Add some vehicle ai functions.
--HG--
branch : trunk
2009-08-15 20:36:54 -05:00
megamage
917bf34a98 *better handle effect 140. do not consider bp > 0 as custom damage.
--HG--
branch : trunk
2009-08-15 20:36:21 -05:00
megamage
cbe2f63d42 *Remove inline because it is not necessary. VC++ will set all functions defined in class declaration as inline automatically.
--HG--
branch : trunk
2009-08-15 20:35:16 -05:00
Machiavelli
bcd0656b0d *Merge
--HG--
branch : trunk
2009-08-16 03:25:27 +02:00
Machiavelli
2844937850 * Clear m_actionsButtons regardless of DB data for other spec when switching specs.
--HG--
branch : trunk
2009-08-16 03:23:51 +02:00
maximius
71c69e3460 *Remove offhand after switching specs if the player can no longer equip that item (ie: Titan's Grip)
--HG--
branch : trunk
2009-08-15 18:21:04 -07:00
Kudlaty
61ed8f90df Merge [SD2]
r1296 Fix typo and check for IN_PROGRESS instead of NOT_STARTED and also return after force EnterEvadeMode in UpdateAI - skip
r1297 Set sysconfdir path in different way for linux compile, to avoid possible DOTCONF++ error at start. Patch by Saeldur - skip
r1298 Fix typo in MC instance script.
r1299 Clean up one MC boss script and remove old workarounds. Patch by Reve
r1300 Add gossip to npc_naladu. Patch by hoshie
r1301 Some minor cleanup and move one folder+source file

--HG--
branch : trunk
2009-08-16 02:46:55 +02:00
Kudlaty
93709273ec Merge [SD2]
r1294 Let EscortAI fill waypoint list at Start(). Scripts using escortAI then no longer need to call FillPointMovementListForCreature().
r1295 Move one misplaced source file.

--HG--
branch : trunk
2009-08-16 02:12:14 +02:00
Anubisss
32078e0624 *Merge. :(
--HG--
branch : trunk
2009-08-16 01:55:22 +02:00
Anubisss
4b31577eb3 *Implement Championing system. More info about this patch at http://www.wowwiki.com/Championing
*Dont forget that this system can only works fine if has a DB support with level 80 instances' reputations(so need some data to creature_onkill_reputation).

--HG--
branch : trunk
2009-08-16 01:54:50 +02:00
Kudlaty
5b42daa7bf Merge [SD2]
r1291 Move one misplaced script in yesterday commits.
r1292 Make own folder for tool, not needed for general work of SD2. - skip
r1293 Add script loader to simplify maintenance of scripts. The scripts must now be added to system/ScriptLoader.cpp instead of old way directly in ScriptMgr.

--HG--
branch : trunk
2009-08-16 01:45:49 +02:00
Kudlaty
6337c3adfb Merge [SD2]
r1288 Update include guards with better naming.
r1289 Fix typo in makefile.am - skip
r1290 Move AI remaining in misc folders to own folder base.
      Rename file to same as others for consistency and update includes accordingly.

--HG--
branch : trunk
2009-08-16 00:53:16 +02:00
Kudlaty
e00175d23b Merge [SD2]
r1287 Move all non-instance scripts that are not related to any special continent to new world folder.
sorry about mistake in last sd2 merge. there should be:
r1286 Restructure file layout and move all non-instance source files to a logical continental single folder.

--HG--
branch : trunk
2009-08-16 00:10:26 +02:00