Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
Alex
5e618a1ca4
Merge pull request #39 from mackal/Fade_Escape_Fix
...
Fixed and cleaned up Client::Escape()
2013-03-24 01:13:54 -07:00
mackal
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
2013-03-23 18:34:06 -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
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
SecretsOTheP
56825e9ed0
Two crash fixes reported on the forums are hopefully fixed.
2013-03-20 10:46:09 -04: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
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
Arthur Ice
faa93c3739
Added some consts to remove 'deprecated string to char*' warnings.
2013-03-09 10:52:25 -08: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
147c96970c
Moved faction stuff around, removed stupid external item status stuff
2013-02-23 15:03:15 -08:00
KimLS
8eb7d0aaa8
Skill caps load with new smem scheme
2013-02-20 13:54:26 -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
JJ
c9d4816a88
Garble text for drunk characters.
2013-02-18 02:21:34 -05:00
joligario
3feeced884
Chat garbled for drunk characters.
2013-02-18 01:59:43 -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
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
