Commit Graph

  • 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
  • e62764ca74 Merge 2124b6398293ab8eeb2fccfb27821528ae561a75 into c94822a2a1f36c0020488631e46749efb0c98c36 #34 SecretsOTheP 2013-03-21 13:46:28 -07:00
  • c94822a2a1 Merge pull request #37 from mackal/stacking_SE_Limits Derision 2013-03-21 13:13:14 -07:00
  • 2124b63982 -Fixed a memleak in inviting mercs to group. -Fixed a duplicate merc in window bug. #34 SecretsOTheP 2013-03-21 00:40:59 -04:00
  • 4e676407f9 Merge 886c7bf634fe2643e883fefd7bb83fa26fde682f into 6ae8fbc0e4915309aa839184b4f8e20f98ee5a9c #37 Michael Cook 2013-03-20 20:31:25 -07:00
  • 886c7bf634 Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence) #37 mackal 2013-03-20 23:29:00 -04:00
  • 56825e9ed0 Two crash fixes reported on the forums are hopefully fixed. SecretsOTheP 2013-03-20 10:46:09 -04:00
  • 925ba2199e Whoops, forgot CMakeLists.txt SecretsOTheP 2013-03-20 07:19:20 -04:00
  • fd8650b8a0 Merge branch 'master' of https://github.com/SecretsOTheP/Server SecretsOTheP 2013-03-20 04:25:34 -04:00
  • 549455b3df Merc message removed. SecretsOTheP 2013-03-20 04:02:33 -04:00
  • f90a5b5b71 Merc message removed. SecretsOTheP 2013-03-20 04:02:33 -04:00
  • 5c76297e5f Merge branch 'master' of https://github.com/EQEmu/Server SecretsOTheP 2013-03-20 04:01:44 -04:00
  • cabf8631d4 Fixed mercenary memleaks in AI_Start and Unsuspend. SecretsOTheP 2013-03-20 04:00:08 -04:00
  • 6ae8fbc0e4 Initialised some data in Mob/Merc constructors to stop valgrind complaining. Derision 2013-03-19 20:44:22 +00:00
  • f32a277643 Fixed memory leak in OP_VeteranRewardsAvailable Derision 2013-03-19 19:22:16 +00:00
  • caf7624912 Merge branch 'master' of git://github.com/EQEmu/Server into infuriate af4t 2013-03-19 01:24:06 -04:00
  • 09df77b56e Changelog fix. badcaptain 2013-03-19 01:03:15 -04:00
  • f5e58e0125 Merge branch 'master' of https://github.com/EQEmu/Server into Mercs badcaptain 2013-03-19 00:57:15 -04:00
  • 660ab53476 Fixed zone crash due to merc focus effects & tribute, merc aggro issues when client in melee range, spell recast timers. Added melee DPS spells/disciplines & support. badcaptain 2013-03-19 00:53:01 -04:00
  • 5c9f2c0d50 Fixed a couple of memory leaks. Derision 2013-03-18 21:09:23 +00:00
  • ea51c862ab Merge branch 'master' of https://github.com/af4t/Server into infuriate af4t 2013-03-17 22:47:25 -04:00
  • d036afee5b Fixed missing version parameter in DB select in GetZoneWeather. Derision 2013-03-17 15:52:48 +00:00
  • 4ab7786828 Merge branch 'master' of https://github.com/EQEmu/Server SecretsOTheP 2013-03-17 10:14:25 -04:00
  • 981cabe857 Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls. Derision 2013-03-17 13:52:43 +00:00
  • 8eef122cec Forgot changelog :x SecretsOTheP 2013-03-17 06:20:12 -04:00
  • 1dc1655891 Hopefully fixed that pesky merc memleak and cleaned up mercs a tad. SecretsOTheP 2013-03-17 06:18:32 -04:00
  • 0bc942f4d5 Test SecretsOTheP 2013-03-15 03:27:45 -04:00
  • 1929d33433 Merge 9fbf9abd47c66d84274aa19b78f1fc8ec394002f into d76a8bd34ac9899d8d90dc0594b09190ac04f315 #33 SecretsOTheP 2013-03-17 03:23:37 -07:00
  • 9fbf9abd47 Forgot changelog :x #33 SecretsOTheP 2013-03-17 06:20:12 -04:00
  • b8170df498 Hopefully fixed that pesky merc memleak and cleaned up mercs a tad. SecretsOTheP 2013-03-17 06:18:32 -04:00
  • fa07966800 Merge 021faf68b3d082af9ee814c04984f59e70d0edca into d76a8bd34ac9899d8d90dc0594b09190ac04f315 #31 SecretsOTheP 2013-03-17 03:16:52 -07:00
  • d76a8bd34a EQExtractor2: Added SQL generation support for current Live client decoder. Derision 2013-03-17 10:09:13 +00:00
  • 021faf68b3 Merge branch 'master' of https://github.com/EQEmu/Server #31 SecretsOTheP 2013-03-17 04:52:52 -04:00
  • 7c264ad097 EQExtractor2 update. Derision 2013-03-16 19:56:09 +00:00
  • 810fdf3cca Resurrection - Fix for RoF + fixed a couple of memory leaks. Derision 2013-03-15 19:37:29 +00:00
  • 3cc6d8e7dc added sectino missed by patch Sorvani 2013-03-15 12:03:02 -05:00
  • 0c14f5a470 initial ifuritate (AE Enrage) implmentation Sorvani 2013-03-15 11:56:03 -05:00
  • c301b30c3a Merge branch 'master' of https://github.com/EQEmu/Server SecretsOTheP 2013-03-15 03:32:43 -04:00
  • 735b4181fa Test SecretsOTheP 2013-03-15 03:27:45 -04:00
  • a14fecaf78 Forgot to remove debugging. badcaptain 2013-03-14 23:13:49 -04:00
  • e12b06a9ad Merge branch 'master' of https://github.com/EQEmu/Server badcaptain 2013-03-14 23:03:39 -04:00
  • 9a82875ad4 Forgot changelog. badcaptain 2013-03-14 22:56:45 -04:00
  • 0b0ee921a5 Fix for hatelist random missing last member on hatelist. JJ 2013-03-14 20:42:02 -04:00
  • 7109a40637 Merge branch 'master' of https://github.com/EQEmu/Server badcaptain 2013-03-14 20:03:48 -04:00
  • 0a805feeec Fixed Merc spell recast timers, changed how Mercs add mobs to their hate lists (should prevent IsEngaged() issues), initial Caster DPS Merc spell casting AI, initial Merc stance implementation, Mercs now suspend when their owner dies to prevent them being bugged (until it can be fixed), added 2 seconds between spell casts to be live-like. badcaptain 2013-03-14 19:51:29 -04:00
  • 1a63ac66e7 Merge d5da4aa90badae1d115c728f1e62d3a2d5db83d1 into 9fdb6862f811c3afd4d4b05d6060dbd1e14f2c9b #30 Arthur Ice 2013-03-10 16:15:43 -07:00
  • d5da4aa90b HandleEnterWorldPacket refactor #30 Arthur Ice 2013-03-10 16:15:23 -07:00
  • 29262d966e HandleCharacterCreatePacket refactor. Arthur Ice 2013-03-10 14:52:46 -07:00
  • b21c8b7eff helps if i remember to actually use the new refactored method. Arthur Ice 2013-03-10 14:41:59 -07:00
  • 1e088ca2ba Refactor HandleRandomNameGeneratorPacket Arthur Ice 2013-03-10 14:39:02 -07:00
  • a8400803cc HandleApproveNamePacket refactored from HandlePacket. Arthur Ice 2013-03-10 14:30:59 -07:00
  • 1f206c1156 Merge branch 'master' of git://github.com/EQEmu/Server Arthur Ice 2013-03-10 14:20:52 -07:00
  • ecbcfed18c Refactoring through method encapsulation on HandlePacket, SendLoginInfoPacket Arthur Ice 2013-03-10 14:18:08 -07:00
  • 0438877203 const changes to remove a few more warnings about string const conversions. Arthur Ice 2013-03-10 14:15:15 -07:00
  • 9fdb6862f8 Updated comment in Handle_OP_ItemPreview Derision 2013-03-10 20:41:09 +00:00
  • e53ae5f6d5 More compiler warning fixes. Derision 2013-03-10 18:55:18 +00:00
  • 0ad1044b2e Added some error logging into ZoneDatabase::NPCSpawnDB for #npcspawn create Derision 2013-03-09 20:13:11 +00:00
  • 64c53fe37b Merge pull request #29 from addtheice/master Derision 2013-03-09 11:55:11 -08:00
  • b61917b979 Merge faa93c3739ad9aa73385d972e8403d533af8cb0e into 0e6272e6d810ff8cd96c71867862de787c1ece37 #29 Arthur Ice 2013-03-09 10:54:30 -08:00
  • faa93c3739 Added some consts to remove 'deprecated string to char*' warnings. #29 Arthur Ice 2013-03-09 10:52:25 -08:00
  • 0e6272e6d8 Removed _log message from zone/CatchSignal on Linux as it can deadlock on shutdown if another signal is received while the _log call is being processed. Derision 2013-03-09 13:21:06 +00:00
  • c363261d00 Fix from Zaela_S to stop mobs aggroing on dead players when using RespawnFromHover. Derision 2013-03-09 13:18:36 +00:00
  • a2500ff814 Fix for DBCore crash KimLS 2013-03-08 18:07:28 -08:00
  • 2af6e8cd16 Merge pull request #28 from af4t/master JJ 2013-03-08 08:42:54 -08:00
  • dc7dc78f55 Merge eb1e88b38c486f2fc71a501f79e154bd595c8d5b into adf42c875041d6860e785a899b483abdb391df01 #28 Kemmler 2013-03-07 20:33:46 -08:00
  • eb1e88b38c Reword blurbs in changelog.txt. #28 af4t 2013-03-07 23:33:21 -05:00
  • c81549a441 Melee tomes named "Skill: ...": had overlooked learn-by-right-click, updated. af4t 2013-03-07 09:42:16 -05:00
  • adf42c8750 Changed some stuff to keep it consistent with old behavior: was seeing crashes related to ptimers on peq. KimLS 2013-03-06 11:19:44 -08:00
  • 2ee8e17ac0 Merge pull request #27 from af4t/master Alex 2013-03-05 23:06:52 -08:00
  • fc02f918b9 Merge 55a72c86cf2f035aa1dc4422a92f5e9ec3a1af7e into f7469412f194f3ea202b5bb2e24f935716b53ccd #27 Kemmler 2013-03-05 23:05:50 -08:00
  • f7469412f1 Merge pull request #23 from addtheice/master Alex 2013-03-05 23:05:27 -08:00
  • 55a72c86cf Merge branch 'master' of https://github.com/af4t/Server #27 af4t 2013-03-05 16:22:01 -05:00
  • a80eb397d5 Stop NPCs from aggroing each other with buffs/beneficial spells. af4t 2013-03-05 15:44:05 -05:00
  • 7926362ab5 Stop NPCs from aggroing each other with buffs/beneficial spells. af4t 2013-03-05 15:44:05 -05:00
  • b0c0ee504e Merge 0c6eee6d81548eed03be42395403d28bd5f9019a into 7af51ff34670474f98bf42ea6fc737983bf5d542 #23 Arthur Ice 2013-03-04 13:03:44 -08:00
  • 7af51ff346 Merge pull request #24 from af4t/master Derision 2013-03-04 12:56:32 -08:00
  • ff37390e46 Merge 4964c17abb651ff734d6f58b6fe3d09540a5e005 into c8ca362eba0cb8fc5875c017d2af713a095f6c99 #24 Kemmler 2013-03-04 12:22:03 -08:00
  • c8ca362eba Few minor issues highlighted by cppcheck/valgrind. Derision 2013-03-04 19:15:07 +00:00
  • 4964c17abb Forgot to update changelog.txt earlier #24 af4t 2013-03-04 13:08:53 -05:00
  • 0c6eee6d81 More warning clean ups (NULL to 0 on int, sprintf flags, typedef on enum) #23 Arthur Ice 2013-03-03 21:45:46 -08:00
  • 950f00fae6 Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc Arthur Ice 2013-03-03 16:17:06 -08:00
  • d8628170b5 Fixed missing include that blocked compile on linux. Arthur Ice 2013-03-03 15:26:40 -08:00
  • 68338dace1 Merge branch 'master' of git://github.com/EQEmu/Server Arthur Ice 2013-03-03 15:22:52 -08:00
  • af1f87a00f Fixed uninitialised variabled tempBot in #bot stance command (cppcheck) Derision 2013-03-03 22:26:57 +00:00
  • 9a47e79e8e Fixed memleak in Client::Handle_OP_MercenaryDataRequest (cppcheck) Derision 2013-03-03 22:22:04 +00:00
  • aceaba0fb0 Fixed uninitialised mercOwner highlighted by cppcheck. Derision 2013-03-03 22:12:14 +00:00
  • e0887d81aa Merge branch 'master' of git://github.com/EQEmu/Server Arthur Ice 2013-03-03 13:02:36 -08:00
  • ff9e4e0780 Merge pull request #22 from addtheice/master Derision 2013-03-02 12:30:26 -08:00
  • 0050bb48ec Merge c8da17c6649ea4961d185fc04f5d6e097a68863d into 7c34a89ec5f0505dde770061850b2ce691b7fbe8 #22 Arthur Ice 2013-03-02 12:04:45 -08:00
  • 6a4f61d3a3 Merge branch 'master' of git://github.com/EQEmu/Server Arthur Ice 2013-03-02 12:01:01 -08:00
  • c8da17c664 Deleted the old and duplicated GNU license text #22 Arthur Ice 2013-03-02 11:58:39 -08:00
  • 7c34a89ec5 Fixed Merc depop bug, added merc rest regen, fixed merc group spell casting bug where mercs would continue to try to cast group buffs on pets of caster who didn't have Pet Affinity AA. badcaptain 2013-03-02 01:07:18 -05:00
  • da4cddf1ef Update README.md Alex 2013-03-01 16:45:10 -08:00
  • 9262c0895f Merge branch 'master' of https://github.com/EQEmu/Server KimLS 2013-02-28 22:33:31 -08:00
  • b5405c35e2 Tests fix + fix for certain factions not loading KimLS 2013-02-28 22:33:20 -08:00