34 Commits

Author SHA1 Message Date
mackal
886c7bf634 Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence) 2013-03-20 23:29:00 -04:00
badcaptain
09df77b56e Changelog fix. 2013-03-19 01:03:15 -04:00
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
SecretsOTheP
8eef122cec Forgot changelog :x 2013-03-17 13:01:54 +00:00
Derision
810fdf3cca Resurrection - Fix for RoF + fixed a couple of memory leaks. 2013-03-15 19:37:29 +00: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
JJ
0b0ee921a5 Fix for hatelist random missing last member on hatelist. 2013-03-14 20:42:02 -04:00
Derision
0ad1044b2e Added some error logging into ZoneDatabase::NPCSpawnDB for #npcspawn create 2013-03-09 20:13:11 +00:00
Derision
0e6272e6d8 Removed _log message from zone/CatchSignal on Linux as it can deadlock on shutdown if another signal is received while the _log call is being processed. 2013-03-09 13:31:54 +00:00
af4t
eb1e88b38c Reword blurbs in changelog.txt. 2013-03-07 23:33:21 -05:00
af4t
c81549a441 Melee tomes named "Skill: ...": had overlooked learn-by-right-click, updated. 2013-03-07 09:42:16 -05:00
af4t
a80eb397d5 Stop NPCs from aggroing each other with buffs/beneficial spells. 2013-03-05 16:19:46 -05:00
af4t
4964c17abb Forgot to update changelog.txt earlier 2013-03-04 13:08:53 -05: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
KimLS
7237c1f54c Shared Memory changelog + something with CMake to support rvalue refs 2013-02-27 16:16:20 -08:00
mackal
dd913de1a2 Mobs will now be removed from XTarget when they clear their feign memory aggro 2013-02-22 22:27:03 -05:00
Derision
e0b38cf3cc World should no longer crash if the start_zone query fails at character creation. 2013-02-19 20:07:53 +00:00
KimLS
e36eefc060 EVENT_DEATH changelog 2013-02-18 19:23:27 -08:00
mackal
357646466a Changelog udpated 2013-02-18 14:22:09 -05:00
Derision
9680c039f0 Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet. 2013-02-18 18:58:26 +00: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
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
Derision
23b2b599a7 Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar. 2013-02-17 20:23:34 +00:00
Derision
d1afad47aa Added optional guildid and minstatus parameters to quest::gmsay(<messsage>, [color], [toworld], [guildid], [minstatus]) 2013-02-17 10:19:12 +00: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
mackal
a510d2593f Update change log 2013-02-16 19:50:19 -05:00
KimLS
b14519b1f5 Derision's revert from svn I missed. 2013-02-16 16:25:57 -08:00
KimLS
da7347f76f svn -> git Migration 2013-02-16 16:14:39 -08:00