2374 Commits

Author SHA1 Message Date
KimLS
275e1144ad Missed the actual sql 2014-11-08 15:22:54 -08:00
KimLS
d987ccf289 Added transactions for corpse creation, added sql to fix a bug in raid member saving in some situations, fixed a bug in encounters 2014-11-08 15:22:03 -08:00
KimLS
fe7774ab75 Merge branch 'master' of github.com:EQEmu/Server 2014-11-08 15:18:52 -08:00
Michael Cook (mackal)
19e6a6909f Merge pull request #283 from KayenEQ/Development
Mez spells will no longer attempt memblur each tic, just on initial cast...
2014-11-08 02:21:32 -05:00
KayenEQ
4446a1ed08 Mez spells will no longer attempt memblur each tic, just on initial cast.
reverted change to calcmaxhp due to potential overflow issues.
2014-11-08 02:07:05 -05: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
Michael Cook (mackal)
f81f8ea5d6 Merge pull request #282 from KayenEQ/Development
Fix for CalcMaxHP
2014-11-06 21:57:16 -05:00
Michael Cook (mackal)
7476ae2a82 Tracking default order should now be correct
Reworked the tracking packet creation, should be better
2014-11-06 21:48:42 -05:00
KayenEQ
0c4a32246b Fix for CalcMaxHP 2014-11-06 21:00:03 -05:00
Michael Cook (mackal)
b8b43c7149 Merge pull request #281 from KayenEQ/Development
Fix to SE_PercentHeal to allow it to work if no max value set.
2014-11-06 02:47:06 -05:00
KayenEQ
b4286b87db Fix to SE_PercentHeal to allow it to work if no max value set. 2014-11-06 01:30:05 -05:00
KimLS
cb0d5ac7d0 Merge branch 'master' of github.com:EQEmu/Server 2014-11-04 21:01:43 -08:00
KimLS
957f05860b Small changes to encounter stuff 2014-11-04 21:01:20 -08:00
SecretsOTheP
d4139b98e3 Linux fix. 2014-11-03 23:01:55 -05:00
SecretsOTheP
29d614421f int16/32 mismatch fixes. see changelog.txt 2014-11-03 22:43:00 -05:00
SecretsOTheP
beff1caf4f Merc/bot fix changelog.txt 2014-11-03 19:30:41 -05:00
SecretsOTheP
29ec6db345 because fuck you mercs and bots 2014-11-03 19:30:11 -05:00
SecretsOTheP
8efc652c10 Fixed overflow on AC and ATK values that can go out of range. 2014-11-03 19:14:58 -05:00
SecretsOTheP
29079a7ec2 changelog.txt 2014-11-03 16:47:26 -05:00
SecretsOTheP
3ac0f1506c Fixed melee lifetap overflows - Because being healed for uint16s is not cool. 2014-11-03 16:45:36 -05:00
JJ
38f1e8847c Make output of GetCharactersInInstance for perl more user-friendly. 2014-11-03 12:35:07 -05:00
Akkadius
cff9e05626 Weird text characters making it into commit 2014-11-02 22:43:08 -06:00
Akkadius
29a36008d1 Tell queue sanity checks 2014-11-02 22:37:16 -06:00
Akkadius
51958b991c Cleaner way to handle out of range and swaps 2014-11-02 22:30:29 -06:00
Akkadius
771279128d Added out of range checking for Spell Save/Loads 2014-11-02 21:16:04 -06:00
JJ
385d70b294 Merge pull request #279 from KayenEQ/Development
Minor code and warning fixes.
2014-11-02 22:01:03 -05:00
JJ
4bd41b3678 Export of additional instance functions to perl as per #128.
Change QuestManager RemoveAllFromInstance function to use existing function to remove all clients from instance.
2014-11-02 20:43:47 -05:00
KayenEQ
527293d2f2 Merge git://github.com/EQEmu/Server into Development 2014-11-02 20:14:59 -05:00
KayenEQ
d754e24a02 Minor code and compiler warning fixes. 2014-11-02 20:14:44 -05:00
Michael Cook (mackal)
b4576435e3 Size check on ServerOP_ChannelMessage 2014-11-02 18:50:02 -05:00
Michael Cook (mackal)
5e1500c93b Merge pull request #278 from KayenEQ/Development
Revert for checking buffs if virus, couple of spells don't require a buff.
2014-11-02 18:48:02 -05:00
KayenEQ
c9073b10a1 Revert for checking buffs if virus, a couple of spells don't require a buff. 2014-11-02 18:34:22 -05:00
JJ
a9f7af59a2 Merge pull request #277 from KayenEQ/Development
Few more minor compiler warnings and code clean up.
2014-11-02 09:00:23 -05:00
KayenEQ
728399e372 Make sure virus is an actual buff before starting timer 2014-11-02 05:35:09 -05:00
KayenEQ
51a3302288 Few more minor compilier warnings and code clean up. 2014-11-02 00:43:01 -04:00
JJ
5decde0af9 (RicardoCampos) End looting before zoning. 2014-11-02 00:10:19 -04:00
JJ
3620ac4eaf Merge pull request #276 from KayenEQ/Development
Fixed compiler warnings and clean up of some code in spell_effects.cpp
2014-11-01 23:34:03 -04:00
JJ
43e906e3c8 Manual merge of new faction system (#256).
Clean up some personal signatures.
2014-11-01 23:27:23 -04:00
KayenEQ
39bb2aa811 minor clear up of 2handstaff block effect code. 2014-11-01 20:57:26 -04:00
JJ
acab4dd443 Fix for duplicate merchant items when same merchant types are in same spawngroup. 2014-11-01 13:37:06 -04:00
Trevius
45ff2cddb7 Fixed potential crash related to Pets/Mercs buffs when targeting themselves. 2014-11-01 11:50:55 -05:00
KimLS
1619324d06 Small bug fixes with encounters, also added eq.load_encounter_with_data(encounter_name, data_string) and unload as well. Allows you to send a message via the encounter system load 2014-10-31 22:09:09 -07:00
KayenEQ
7b0045290d Fixed most of the compiler warnings and cleaned up some code in spells_effects.cpp 2014-10-31 22:40:49 -04:00
KayenEQ
441ddf233a Merge git://github.com/EQEmu/Server into Development 2014-10-31 21:47:20 -04:00
KayenEQ
306c641c72 merge 2014-10-31 21:47:07 -04:00
Michael Cook (mackal)
b417e23d97 Allow to set/del qglobals in encounters scripts 2014-10-31 00:02:05 -04:00
KimLS
481492cb59 Fixed SQL to be current date, also it will no longer rely on a field that we removed from the db [skip ci] 2014-10-30 19:38:13 -07:00
Michael Cook (mackal)
d3fbd026b4 Fix error with commit 2014-10-30 22:08:45 -04:00
Michael Cook (mackal)
2d77adeeb8 Merge pull request #273 from KayenEQ/Development
Allow npc_types field 'special_abilities' to be set as null in database.
2014-10-30 22:01:55 -04:00
KayenEQ
f84130fc7c fix 2014-10-30 21:40:46 -04:00