Commit Graph
23 Commits
Author SHA1 Message Date
Trevius 0a0260b75b Merge branch 'master' of https://github.com/EQEmu/Server 2014-12-02 13:13:50 -06:00
Trevius 52eb4d2d4e Fixed Mercenary Depop Crash in Windows. 2014-12-02 00:07:09 -06:00
Trevius 24ea7a0d45 Mercenaries now spawn as the same Gender and Size of the Merchant they are purchased from.
Mercenaries now spawn with randomized facial features when purchased.
Setting a lastname for NPCs will now override any hard coded lastname (such as GM Trainers).
2014-12-01 19:54:01 -06:00
Trevius 8cd19670ab Minor improvement to last commit. 2014-11-28 20:30:35 -06:00
Trevius 84fa042c75 Fixed a zone crash related to numhits for spells.
Fixed a query related to group leaders logging in.
Fixed a world crash related to attempting to join an adventure with Mercenaries.
2014-11-28 20:23:42 -06:00
Trevius b4862dea45 Compile Fix and fix to prevent Mercenaries from being set as Group Leader. 2014-11-25 02:54:02 -06:00
Trevius 09e13d0034 Spells that modify model size are now limited to 2 size adjustments from the base size. 2014-11-25 02:22:58 -06:00
Trevius bee04c1b53 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-24 02:36:13 -06:00
Trevius 2fbe6b304c Added Rule NPC:EnableMeritBasedFaction (disabled by default) - Allows faction gain to work similar to experience. 2014-11-24 02:32:33 -06:00
Trevius 2f1191b263 Fixing my Swarm Pet "fix". 2014-11-23 23:17:57 -06:00
Trevius 79a70271d5 Crash fix for Swarm Pets. 2014-11-22 12:53:49 -06:00
Trevius d49426f763 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-22 00:27:40 -06:00
Trevius c5a90adb39 Grouping with Mercenaries is considerably less buggy. 2014-11-22 00:22:12 -06:00
Trevius b5c6b47639 Minor Merc Correction. 2014-11-19 22:52:49 -06:00
Trevius 62e22d1aea Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly. 2014-11-19 22:46:15 -06:00
Trevius 1973a065c5 Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-19 22:43:55 -06:00
Trevius 6c5248b9a9 Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly. 2014-11-19 22:43:19 -06:00
Trevius 8f32a9949b Fixed bad formatting of client.h and merc.h caused by my last commit. 2014-11-18 17:32:59 -06:00
Trevius a6b9e6cb3c Trevius: Mercenaries can now zone once again. 2014-11-18 01:02:11 -06:00
Trevius b4e4d94061 Fixed dynamic merchant list loading. Allows any merchant to be used in any zone. 2014-11-06 21:41:51 -06:00
Trevius 45ff2cddb7 Fixed potential crash related to Pets/Mercs buffs when targeting themselves. 2014-11-01 11:50:55 -05:00
Trevius bb541eeb60 Fixed potential endless quest loop with EVENT_COMBAT and WipeHateList(). 2014-04-01 23:00:15 -05:00
Trevius 174cb1876a Prevented an endless loop crash related to EVENT_TASK_STAGE_COMPLETE. 2014-03-31 22:03:11 -05:00