Commit Graph

  • ffcff4aea1 Remove trailing whitespace j883376 2013-05-06 13:07:41 -04:00
  • 56b15f558c Merge pull request #4 from EQEmu/master josheb 2013-05-09 06:19:29 -07:00
  • 6ea9c9218d Merge branch 'master' of git://github.com/EQEmu/Server af4t 2013-05-09 09:07:16 -04:00
  • b6c0e7c302 perl changes KimLS 2013-05-09 03:22:56 -07:00
  • bdcb9d0c00 Merge branch 'master' into lua KimLS 2013-05-08 21:04:02 -07:00
  • 7a93966158 VS2012 fix + return 0 fix KimLS 2013-05-08 21:03:35 -07:00
  • b8adbee4ee Parser stuff, fix for GetSpawnKillCount + item_tick KimLS 2013-05-08 21:01:15 -07:00
  • feae79b417 Merge from master KimLS 2013-05-08 20:22:40 -07:00
  • bcf9546b2d Partial perl parser rewrite, want to make it cleaner and have it match the interface KimLS 2013-05-08 20:18:39 -07:00
  • 273cb928bf removed using namespace std Arthur Ice 2013-05-08 18:13:33 -07:00
  • 7735639e57 Merge branch 'c_11_conversion' of https://github.com/addtheice/Server Arthur Ice 2013-05-08 17:40:04 -07:00
  • 23c524812d Removed the _MSC_VER special cases for Visual Studio 2008 and lower. We no longer support 2008 and lower so these defines will never be used. Arthur Ice 2013-05-05 16:58:16 -07:00
  • c6ca89907c Converted a lot of the char[] stuff internally into std:string in addition I switched over to <string> rather than <string.h> Arthur Ice 2013-05-05 16:40:03 -07:00
  • 87a75c6100 Merge pull request #1 from EQEmu/master Kemmler 2013-05-08 14:22:30 -07:00
  • f6100ed834 Fixed NPC::GetScore and XS_NPC_GetScore mackal 2013-05-08 17:07:49 -04:00
  • 21a9434f89 Changed dummy strings written into the TaskSelector packet from nullptr to ABCD since the packet size calculation was based on the strings being 4 characters long. Derision 2013-05-08 20:02:55 +01:00
  • ea6e239d58 Merge pull request #54 from af4t/master josheb 2013-05-08 05:46:49 -07:00
  • 4ee4992330 Merge branch 'master' of git://github.com/EQEmu/Server af4t 2013-05-08 06:07:11 -04:00
  • 059ecdb50b Fix NULL to nullptr for SQL queries take 2 Michael Cook 2013-05-07 18:20:09 -04:00
  • 0838d4507a Fix NULL to nullptr for SQL queries Michael Cook 2013-05-07 17:41:05 -04:00
  • 5cda797531 VS2010 compatibility af4t 2013-05-07 15:19:27 -04:00
  • 308a21e0e2 Merge pull request #51 from josheb/master josheb 2013-05-07 05:44:07 -07:00
  • a0a92587b4 Fixing some regressions tabasco 2013-05-06 16:24:44 -05:00
  • 8e49ab9179 Merge pull request #3 from EQEmu/master josheb 2013-05-06 14:16:46 -07:00
  • ac1d931b5e Merge from master KimLS 2013-05-06 00:05:50 -07:00
  • 90c7fab452 Merge pull request #50 from j883376/master Alex 2013-05-05 23:42:14 -07:00
  • a4b985cd96 Merge pull request #49 from addtheice/master Alex 2013-05-05 23:41:47 -07:00
  • 6e9e81a890 Working on fixing up QuestInterface to make multiple parsers work together in harmony, need to fix up Embperl parser next KimLS 2013-05-05 23:36:15 -07:00
  • d7dff7d7a6 Removed the _MSC_VER special cases for Visual Studio 2008 and lower. We no longer support 2008 and lower so these defines will never be used. Arthur Ice 2013-05-05 16:58:16 -07:00
  • 37b7a49faf Converted a lot of the char[] stuff internally into std:string in addition I switched over to <string> rather than <string.h> Arthur Ice 2013-05-05 16:40:03 -07:00
  • 05d7c12d38 Various customizations from DungeonCrawl Tabasco 2013-05-05 18:20:22 -05:00
  • f983d19e01 Removed my bookmark comments and cleaned up itemtick for cases where there are no tick items. Tabasco 2013-05-05 17:53:34 -05:00
  • 4a0749f811 Change NULL to nullptr in RemoveAutoXTargets() j883376 2013-05-05 18:51:20 -04:00
  • e2fd78b510 Fix Auto XTargets not clearing on death j883376 2013-05-05 06:47:53 -04:00
  • 7560b6b0a7 NULL to nullptr Arthur Ice 2013-05-04 18:06:58 -07:00
  • 824b101831 Merge pull request #2 from EQEmu/master josheb 2013-05-04 07:30:46 -07:00
  • e1c2657b11 NULL check in Merc::CalcItemBonuses Derision 2013-05-03 09:36:16 +01:00
  • d3588d2c95 PERL ON BY DEFAULT - THANKS DALAYA KimLS 2013-05-02 23:24:52 -07:00
  • c5c945f0c3 Make perl truely optional (Dalaya) KimLS 2013-05-02 23:21:04 -07:00
  • 022713996a Changed return type of CRC16 to uint16 Derision 2013-04-28 18:57:08 +01:00
  • d2c7f23ec9 Implement CRC16 using CRC32. PiB 2013-04-27 19:13:34 +01:00
  • 232d1e2ca8 Verify minimum size of OP_Packet, OP_Fragment and OP_OutOfOrderAck Derision 2013-04-27 16:22:29 +01:00
  • 401e897019 Verify OP_Ack size & fix crash in BasePacket::build_raw_header_dump due to uninitialised timestamp Derision 2013-04-27 15:45:24 +01:00
  • 61f7009378 EQExtractor2 SQL gen support for current client. Derision 2013-04-25 19:04:33 +01:00
  • 43b91b5938 Merge pull request #1 from EQEmu/master josheb 2013-04-25 05:34:17 -07:00
  • e2f25d1c92 Fixed a couple of merc stat issues and a few bot aggro issues, removed unneeded bot pet AI. badcaptain 2013-04-25 00:42:52 -04:00
  • 56490400ca Dungeon Crawl custom code merge Added numerous modding hooks. Added rules: Character:KeepLevelOverMax - Don't delevel a character if they are found to be over max level rule. Spells:UseCHAScribeHack - Optionally omit spells with CHA in effect12 when using scribespells and traindiscs Combat:MonkACBonusWeight - Adjust the weight threshold for monk AC bonus Combat:ClientStunLevel - Adjust the level clients kicks and bashes start to roll for stuns Combat;QuiverWRHasteDiv - Adjust the divisor applied to weight reduction for haste calcs Combat:UseArcheryBonusRoll - Make archery stationary bonus a roll Combat:ArcheryBonusChance - Archery stationary bonus chance Tabasco 2013-04-24 15:58:51 -05:00
  • b15cb08f54 EQExtractor2 update. Derision 2013-04-24 19:31:13 +01:00
  • 9b015a2975 Merge pull request #48 from addtheice/master Derision 2013-04-23 13:16:25 -07:00
  • b09a3840eb Turn HandleZoneChangePacket into method. Arthur Dene Ice 2013-04-22 23:22:13 -07:00
  • 495510a02e Reorganized handling of Packets to be a bit cleaner. Arthur Dene Ice 2013-04-22 23:18:40 -07:00
  • ea606ef80d Turn DeleteCharacterPacket handling into a method. Arthur Dene Ice 2013-04-22 23:14:00 -07:00
  • 27493c3d75 Turn EnterWorldPacket handling into a method. Arthur Dene Ice 2013-04-22 23:10:57 -07:00
  • cc07d511a5 Turn CharacterCreatePacket handling into a method. Arthur Dene Ice 2013-04-22 23:00:44 -07:00
  • 5b3ec4fb7c Turn CharacterCreateRequestPacket handling into a method. Arthur Dene Ice 2013-04-22 22:56:55 -07:00
  • 18da8fe44d Turn GenerateRandomNamePacket handling into a method. Arthur Dene Ice 2013-04-22 22:52:29 -07:00
  • 211248b50e Turn SendLoginInfoPacket handling into a method. Arthur Dene Ice 2013-04-22 22:47:19 -07:00
  • 969f0c535e Turn NameApprovalPacket handling into a method. Arthur Dene Ice 2013-04-22 22:44:29 -07:00
  • a7ce66856b Fix rare case where heals from buffs could be negative. JJ 2013-04-20 14:04:08 -04:00
  • 3b42f295d6 Moved entity_list.Clear() prior to destruction of Perl objects in zone shutdown Derision 2013-04-12 19:20:43 +01:00
  • b8febdd440 Realized there was a better way to do the DB entries for salvage, so I changed the script. Run the optional 2013_04_09_SalvageCleanOld.sql if you ran the old script. mackal 2013-04-09 14:50:51 -04:00
  • f8795bcd72 Implemented Salvage AA. Added a new coloumn to tradeskill_recipe_entires called salvagecount that works much in the same way to fail/success/componentcount The code will default to the component list if nothing is found with a salvagecount New script: generate_salvage.py will generate the entries for recipes with a failcount (make sure your config is vaild XML as well, it complains if it isn't) mackal 2013-04-08 22:33:19 -04:00
  • 53301289f5 Merge branch 'salvage' mackal 2013-04-08 17:30:22 -04:00
  • 51896050ed Fix XML Type Declaration in example configs mackal 2013-04-08 17:20:03 -04:00
  • 81ca7a1bfd More work on salvage, added some extra checks and won't return stacks of items mackal 2013-04-08 14:16:08 -04:00
  • 91c817d9dd Work on implementing salvage mackal 2013-04-07 22:38:43 -04:00
  • 88b9f96b91 Attempting manual merge for Nature's Bounty JJ 2013-04-06 08:23:09 -04:00
  • b2d5ad6904 Merge pull request #46 from mackal/pet_fixes_again JJ 2013-04-05 17:16:19 -07:00
  • 20f086dc37 Switched rest of pet messages to MT_PetResponse Overloaded Mob::Say_StringID with a version that takes a message type mackal 2013-04-03 16:09:44 -04:00
  • 6fa93f243f Merged from Master & changelog. badcaptain 2013-04-02 19:17:28 -04:00
  • 15e31d1c03 Merge branch 'master' of https://github.com/EQEmu/Server badcaptain 2013-04-02 19:10:18 -04:00
  • a787a7ce72 Fixed Merc lack of use of heal over time spells (causing excessive healing), fixed pet mitigation/AC issues. badcaptain 2013-04-02 19:09:32 -04:00
  • 989d132423 Merge pull request #45 from mackal/aa_fix JJ 2013-04-01 15:49:19 -07:00
  • 757fc01b78 Patch for: -Perl blessing of exported variables is causing the SVs to be overwritten but never freed by the Perl GC. I'm not sure if this is a feature or a bug in Perl as the documentation sucks. KimLS 2013-04-01 14:23:54 -07:00
  • 353d7cede0 Bards can now use instant cast AAs while singing (Fading Memories, Boastful Bellow) AA reuse timers now start before the spell is cast and reset upon failure or canceling mackal 2013-04-01 17:19:45 -04:00
  • fb0add070b Merge pull request #43 from mackal/pet_fixes Derision 2013-03-31 04:06:16 -07:00
  • 96b42ed86f Fix pet message to use StringIDs, most should be correct related to pet "saying" or just the client getting a message Added the pet taunting message mackal 2013-03-30 22:57:20 -04:00
  • 2dde4dce12 Merge pull request #42 from SecretsOTheP/master JJ 2013-03-26 18:15:50 -07:00
  • c7ff207017 Made Merc::AddMercToGroup handle cleaning up old groups as opposed to doing it in each location before AddMercToGroup. This should fix cases where the Merc's owner is invalid and being referenced, which causes the crash located in: SecretsOTheP 2013-03-25 13:07:58 -04:00
  • 23820a369e Moved around some data in Mercs to help prevent another crash... dunno if it actually will fix it but it can't hurt >_< SecretsOTheP 2013-03-24 18:08:03 -04:00
  • 24d4eaf65d Merge pull request #41 from SecretsOTheP/master JJ 2013-03-24 11:56:06 -07:00
  • e0b05e573e Merc group/depop crash fixes. SecretsOTheP 2013-03-24 14:31:03 -04:00
  • e2b9efaf49 Fixed SQL JJ 2013-03-24 08:36:53 -04:00
  • 349eb371c6 Merge pull request #40 from af4t/master JJ 2013-03-24 05:20:29 -07:00
  • afe3ba40cf Fix typos af4t 2013-03-24 08:14:50 -04:00
  • 5e618a1ca4 Merge pull request #39 from mackal/Fade_Escape_Fix Alex 2013-03-24 01:13:54 -07:00
  • d011332647 Merge pull request #38 from SecretsOTheP/master Alex 2013-03-24 01:13:14 -07:00
  • bc73e9c4e3 Whoops. Fixed a small change I did. SecretsOTheP 2013-03-24 04:02:47 -04:00
  • e609ec1df6 Fix for a crash issue related to groups that both PEQ and Armm reported on the forums. SecretsOTheP 2013-03-24 04:01:49 -04:00
  • 2073ca8d38 Fixed and cleaned up Client::Escape() Fixed SE_FadingMemories to use Client::Escape() Rogue AA Escape now uses a spell instead of AA Action Bard AA Fading Memories now only uses the AA Action to eat mana mackal 2013-03-23 18:34:06 -04:00
  • a6f2c1be8a Syntax error, better place for entity list removal SecretsOTheP 2013-03-23 10:13:29 -04:00
  • 18e9714273 Another safeguard against a dangling pointer. SecretsOTheP 2013-03-23 10:10:03 -04:00
  • fa18991917 Added a few checks to resolve dangling pointers involving Mercs. Similar to the AIYellForHelp crash fixed years ago by Rogean. SecretsOTheP 2013-03-23 10:04:49 -04:00
  • b0b342a020 Merge branch 'master' of https://github.com/SecretsOTheP/Server SecretsOTheP 2013-03-23 05:05:16 -04:00
  • 8e604fd3db Merge branch 'master' of https://github.com/EQEmu/Server SecretsOTheP 2013-03-23 05:02:27 -04:00
  • abaad22eb4 -Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly. -Merc unsuspend timers should now be more reliable across zone shutdown. SecretsOTheP 2013-03-23 04:58:03 -04:00
  • ac040b5197 Added some pointer checks as discussed in issue #36 JJ 2013-03-22 21:48:57 -04:00
  • 9b1a18d9a3 Merge branch 'master' of https://github.com/EQEmu/Server badcaptain 2013-03-22 00:07:22 -04:00
  • a20c7735e8 Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes. badcaptain 2013-03-22 00:03:50 -04:00
  • c94822a2a1 Merge pull request #37 from mackal/stacking_SE_Limits Derision 2013-03-21 13:13:14 -07:00