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
|
d76a8bd34a
|
EQExtractor2: Added SQL generation support for current Live client decoder.
|
2013-03-17 10:09:13 +00:00 |
|
Derision
|
7c264ad097
|
EQExtractor2 update.
|
2013-03-16 19:56:09 +00: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
|
950f00fae6
|
Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc
|
2013-03-03 16:17:06 -08: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 |
|
KimLS
|
92ed7e694f
|
Merge branch 'master' into shared_mem
|
2013-02-26 21:29:34 -08:00 |
|
af4t
|
04dfe4512f
|
SK AA Touch of the Wicked should reduce reuse timers for Improved Harm Touch & Leech Touch as well as regular HT. Add to aa_actions with same redux rate as regular HT
|
2013-02-26 09:48:36 -05:00 |
|
KimLS
|
5bb604248f
|
Removed obsolete cleanipc program
|
2013-02-24 10:52:52 -08:00 |
|
KimLS
|
edc4b4039b
|
Optional Merc Spells fix for violation of commit rules.
|
2013-02-17 22:57:15 -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
|
0a9642e776
|
utils/sql/git added
|
2013-02-16 18:05:41 -08:00 |
|
KimLS
|
0aa958de8f
|
Moved queryserv sql to svn so I can more easily have a git section without confusion
|
2013-02-16 16:47:28 -08:00 |
|
KimLS
|
da7347f76f
|
svn -> git Migration
|
2013-02-16 16:14:39 -08:00 |
|