2397 Commits

Author SHA1 Message Date
cavedude00
8594148496 Fixed npc_types_tint not being loaded properly. 2014-11-12 11:29:10 -08:00
JJ
dd869695c4 Merge pull request #288 from KayenEQ/Development
optimization for how do endurance upkeep for discs
2014-11-12 04:41:07 -05:00
KayenEQ
7943a73cfb code fix 2014-11-12 02:03:24 -05:00
KayenEQ
59bcd031c8 Added a simple check to prevent DoEnduranceUpkeep (1 sec persistent timer)
from constantly checking when client has no endurance drain effects.
This was running 24/7 for all classes.
2014-11-12 01:54:21 -05:00
Uleat
22cc86e6a0 Removed type qualifier for SkillUseTypes enum 2014-11-11 18:01:21 -05:00
Uleat
a763fc08b6 Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
	changelog.txt
2014-11-11 00:14:18 -05:00
Uleat
8ae234aedf Real fix for GM trainer crash..evidently the problem went deeper than an undefined condition... 2014-11-11 00:11:44 -05:00
JJ
793487b825 Yellow faction messages. 2014-11-10 22:11:23 -05:00
Uleat
bb5ae7447d Fix for GM Trainer crashing server (undefined behavior on enum cast) 2014-11-10 21:41:39 -05:00
JJ
0370156179 Fix changelog. [skip ci] 2014-11-10 10:52:17 -05:00
JJ
39cab761eb Merge pull request #287 from KayenEQ/Development
Implemented support for using target rings from item clicks
2014-11-10 10:39:29 -05:00
KayenEQ
720e80377e Merge git://github.com/EQEmu/Server into Development
Conflicts:
	changelog.txt
	common/eq_packet_structs.h
	common/patches/underfoot_structs.h
	common/spdat.h
	zone/effects.cpp
	zone/mob.cpp
	zone/spells.cpp
2014-11-10 10:22:50 -05:00
KayenEQ
3d44050959 Implemented support for using target rings from item clicks.
(Thanks again to Lecht for the help)
2014-11-10 10:11:29 -05:00
JJ
d5efa0f23c Manual merge of TargetRing pull request #286. 2014-11-10 10:00:53 -05:00
KayenEQ
e63b310058 Merge git://github.com/EQEmu/Server into Development
Conflicts:
	changelog.txt
2014-11-10 09:42:59 -05:00
JJ
384d8c6167 Merge pull request #285 from addtheice/legacy_removal
Removed two unused functions
2014-11-10 00:47:55 -05:00
JJ
d23608964e Implement new Live-like faction adjustment message through optional rule. 2014-11-09 23:54:01 -05:00
KayenEQ
d656db843a Implemented spell Target Type (45) 'Target Rings' on Underfoot.
Thanks to Lecht for figuring out op code side of it.
2014-11-09 22:37:12 -05:00
Arthur Ice
0ed1e539ae Removed two unused functions 2014-11-09 15:12:31 -08:00
SecretsOTheP
d8a8b8e6dc Merge branch 'master' of https://github.com/EQEmu/Server 2014-11-09 03:40:59 -05:00
SecretsOTheP
77f0e7919e Indentation fix. Ornamentation Augments are integrated now. 2014-11-09 03:40:33 -05:00
Natedog2012
587ddc0fdd fix for copy paste error that linux didnt like 2014-11-09 03:33:58 -05:00
Natedog2012
efdc177b78 Implement RoF + UF ornament augmentation.. thanks for the help Drajor! 2014-11-09 03:33:58 -05:00
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