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 |
|
Derision
|
5c9f2c0d50
|
Fixed a couple of memory leaks.
|
2013-03-18 21:09:23 +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 |
|
badcaptain
|
a14fecaf78
|
Forgot to remove debugging.
|
2013-03-14 23:13:49 -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 |
|
Alex
|
f7469412f1
|
Merge pull request #23 from addtheice/master
Fixed missing include that blocked compile on linux.
|
2013-03-05 23:05:27 -08:00 |
|
Derision
|
c8ca362eba
|
Few minor issues highlighted by cppcheck/valgrind.
|
2013-03-04 19:15:07 +00: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
|
aceaba0fb0
|
Fixed uninitialised mercOwner highlighted by cppcheck.
|
2013-03-03 22:12:14 +00: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
|
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
|
7ce6f4de0d
|
More shared memory work + moved spdat from zone to common
|
2013-02-19 15:33:21 -08: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 |
|
KimLS
|
15dc9cfaf4
|
Some warning fixes, unreferenced local variables.
|
2013-02-16 22:07:32 -08:00 |
|
KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|