 badcaptain
|
f5e58e0125
|
Merge branch 'master' of https://github.com/EQEmu/Server into Mercs
Conflicts:
changelog.txt
|
2013-03-19 00:57:15 -04:00 |
|
|
badcaptain
|
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.
|
2013-03-19 00:53:01 -04:00 |
|
|
badcaptain
|
a14fecaf78
|
Forgot to remove debugging.
|
2013-03-14 23:13:49 -04:00 |
|
|
badcaptain
|
e12b06a9ad
|
Merge branch 'master' of https://github.com/EQEmu/Server
|
2013-03-14 23:03:39 -04:00 |
|
|
badcaptain
|
9a82875ad4
|
Forgot changelog.
|
2013-03-14 22:56: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 |
|
|
badcaptain
|
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.
|
2013-03-02 01:07:18 -05:00 |
|
|
badcaptain
|
5d8af58e57
|
Oops, it's not a leap year.
|
2013-03-01 00:34:25 -05: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 |
|
|
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 |
|