JJ
|
88b9f96b91
|
Attempting manual merge for Nature's Bounty
|
2013-04-06 08:23:09 -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 |
|
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 |
|
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 |
|
Derision
|
07979ce2de
|
Client version is now returned by the stream proxy as a number.
|
2013-02-17 18:09:31 +00:00 |
|
KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|