pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
190 Commits 88 Branches 159 Tags
Commit Graph

38 Commits

Author SHA1 Message Date
SecretsOTheP
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: 
http://www.eqemulator.org/forums/showthread.php?t=36670&page=2
 2013-03-25 13:07:58 -04:00
SecretsOTheP
e0b05e573e Merc group/depop crash fixes. 2013-03-24 14:31:03 -04:00
SecretsOTheP
bc73e9c4e3 Whoops. Fixed a small change I did. 2013-03-24 04:02:47 -04:00
SecretsOTheP
e609ec1df6 Fix for a crash issue related to groups that both PEQ and Armm reported on the forums. 2013-03-24 04:01:49 -04:00
SecretsOTheP
b0b342a020 Merge branch 'master' of https://github.com/SecretsOTheP/Server 
Conflicts:
	common/patches/RoF.cpp
 2013-03-23 05:05:16 -04:00
SecretsOTheP
8e604fd3db Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	zone/client_packet.cpp
	zone/merc.cpp
	zone/npc.cpp
 2013-03-23 05:02:27 -04:00
SecretsOTheP
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.
 2013-03-23 04:58:03 -04:00
badcaptain
a20c7735e8 Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes. 2013-03-22 00:03:50 -04:00
SecretsOTheP
2124b63982 -Fixed a memleak in inviting mercs to group. 
-Fixed a duplicate merc in window bug.
 2013-03-21 00:40:59 -04:00
SecretsOTheP
cabf8631d4 Fixed mercenary memleaks in AI_Start and Unsuspend. 2013-03-20 04:00:08 -04:00
SecretsOTheP
4ab7786828 Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	zone/client_packet.cpp
 2013-03-17 10:14:25 -04:00
Derision
981cabe857 Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls. 2013-03-17 13:52:43 +00:00
SecretsOTheP
1dc1655891 Hopefully fixed that pesky merc memleak and cleaned up mercs a tad. 2013-03-17 13:01:54 +00:00
SecretsOTheP
0bc942f4d5 Test 2013-03-17 13:01:53 +00:00
SecretsOTheP
b8170df498 Hopefully fixed that pesky merc memleak and cleaned up mercs a tad. 2013-03-17 06:18:32 -04:00
SecretsOTheP
021faf68b3 Merge branch 'master' of https://github.com/EQEmu/Server 2013-03-17 04:52:52 -04:00
Derision
810fdf3cca Resurrection - Fix for RoF + fixed a couple of memory leaks. 2013-03-15 19:37:29 +00:00
SecretsOTheP
c301b30c3a Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	zone/client_packet.cpp
 2013-03-15 03:32:43 -04:00
SecretsOTheP
735b4181fa Test 2013-03-15 03:27:45 -04:00
badcaptain
7109a40637 Merge branch 'master' of https://github.com/EQEmu/Server 2013-03-14 20:03:48 -04:00
badcaptain
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. 2013-03-14 19:51:29 -04:00
Derision
9fdb6862f8 Updated comment in Handle_OP_ItemPreview 2013-03-10 20:41:09 +00:00
Derision
e53ae5f6d5 More compiler warning fixes. 2013-03-10 18:55:18 +00:00
af4t
c81549a441 Melee tomes named "Skill: ...": had overlooked learn-by-right-click, updated. 2013-03-07 09:42:16 -05:00
Arthur Ice
0c6eee6d81 More warning clean ups (NULL to 0 on int, sprintf flags, typedef on enum) 2013-03-03 21:45:46 -08:00
Derision
9a47e79e8e Fixed memleak in Client::Handle_OP_MercenaryDataRequest (cppcheck) 2013-03-03 22:22:04 +00:00
badcaptain
ea72975e69 Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs. 2013-03-01 00:01:27 -05:00
KimLS
c31b2b65c1 NPC Faction lists to new shared memory scheme 2013-02-23 13:45:19 -08:00
KimLS
6f13d0cfbc Partial work on loot tables (non-compiling) 2013-02-21 22:13:33 -08:00
KimLS
f8bae86082 Spells via shared memory work, removal of blah, general fixes 2013-02-19 22:20:30 -08:00
KimLS
7ce6f4de0d More shared memory work + moved spdat from zone to common 2013-02-19 15:33:21 -08:00
KimLS
0d16361a40 Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database 2013-02-18 19:00:07 -08:00
mackal
11d9838faa Added the item_name field to potionbelt to give the user the Tool Tip 2013-02-18 14:19:20 -05:00
badcaptain
a41874b6a7 Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc. 2013-02-18 00:50:19 -05:00
Derision
07979ce2de Client version is now returned by the stream proxy as a number. 2013-02-17 18:09:31 +00:00
KimLS
15dc9cfaf4 Some warning fixes, unreferenced local variables. 2013-02-16 22:07:32 -08:00
mackal
38d4fbc863 Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define) 2013-02-16 20:14:07 -05:00
KimLS
da7347f76f svn -> git Migration 2013-02-16 16:14:39 -08:00