2397 Commits

Author SHA1 Message Date
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
KayenEQ
57f8f61094 code optimization 2014-10-30 21:22:53 -04:00
KayenEQ
5ec0b9993a Merge git://github.com/EQEmu/Server into Development 2014-10-30 19:51:22 -04:00
Uleat
65cb049a38 Added Client::InterrogateInventory() and command #interrogateinv to manually invoke it. (GM's - use #interrogateinv help) 2014-10-28 11:35:26 -04:00
KayenEQ
3247137ef2 Added swarm pet checks to viral spreading function. 2014-10-27 02:20:25 -04:00
KayenEQ
adb8175654 Support for spells_new field 'viral_range' 2014-10-26 02:05:36 -04:00
KayenEQ
5afd6b8628 Added 'hit chance' extra attack option can be applied to future special attacks ect. 2014-10-24 23:36:02 -04:00
KayenEQ
4cb6a5635e Merge git://github.com/EQEmu/Server into Development 2014-10-24 23:28:15 -04:00
KimLS
b54411e533 Fix for not loading some account data on character load 2014-10-24 19:05:04 -07:00
Michael Cook (mackal)
7f85d8c8a2 Optional SQL to add AA Quick Draw 2014-10-24 01:06:07 -04:00
Uleat
c95b18da85 Fixed stacking issue in world tradeskill containers. (Added #peekinv world) 2014-10-22 22:57:20 -04:00
Michael Cook (mackal)
a062c27e1a Take into account endurance bonuses from AAs 2014-10-22 22:27:51 -04:00
Michael Cook (mackal)
c5df59a2f0 Merge pull request #274 from RicardoCampos/Development
Bugfix: Corpse stays locked when looting fails
2014-10-22 22:01:53 -04:00
RicardoCampos
d538b48fbc Merge remote-tracking branch 'origin/master' into Development 2014-10-21 22:51:53 +01:00
RicardoCampos
0a27273d64 Bugfix: Corpse stays locked when looting fails
If looting fails either because of cooldown or there are items on your
cursor, the client is sent an end loot packet- the client releases the
corpse but no one else can loot. This simply resets BeingLootedBy in
this instance.
2014-10-21 22:48:42 +01:00
KayenEQ
22170527c4 Small update to prior commit. 2014-10-21 14:24:25 -04:00
KayenEQ
f0f920d0e8 Fix for bug with Discipline recast timers preventing them from
working properly if you used a focus effect to reduce recast time
to zero.

(Specifically the recast timer failed to reset in the situation
where you had already used the disc WIHTOUT the focus applied, then applied
the focus and tried to have it reduced).
2014-10-21 14:14:35 -04:00
KayenEQ
193f7b0fe3 Fix so NPC don't ghost when casting spells from scripts while moving. 2014-10-20 01:16:08 -04:00
Michael Cook (mackal)
c81491f97e Inspect buffs rank 1 will now show NPC buffs in target window (SoD+) 2014-10-20 01:05:38 -04:00
KayenEQ
bb91265b2b Allow npc_types field 'special_abilities' to be set as null in database.
Changed due to issues when trying to copy npcs or remove abilities from
the field directly in the dataabase.
2014-10-20 00:36:13 -04:00
Uleat
affb735c38 Merge branch 'master' of https://github.com/EQEmu/Server 2014-10-19 22:31:04 -04:00
Uleat
3db2332821 Missed one! 2014-10-19 22:30:45 -04:00
Michael Cook (mackal)
a6ae2ca635 Switch Inspect Buffs to use the OP code
Client 6.2 is SOL until someone find the op for that client
2014-10-19 22:30:11 -04:00
Michael Cook (mackal)
466eecacc4 Implement Group Inspect Buffs for raids 2014-10-19 18:34:43 -04:00
Michael Cook (mackal)
a327c91bac Implement group mentoring while in raids (SoF+ only)
Note: This does not allow the raid leader to share raid leader XP
and since the raid leader doesn't gain group leadership, they can't
share that either.
2014-10-19 17:20:07 -04:00
Uleat
cef2aa64d9 Fixed server<->corpse translators to reflect what actually needs to be translated (should not have affected anything in the old configuration) 2014-10-19 15:03:11 -04:00
Uleat
69a124e11f Updated #peekinv to display item links properly in RoF clients 2014-10-19 11:39:35 -04:00
Michael Cook (mackal)
3f056462d6 Enable gaining of group leadership while in raids
Note: raid leaders can only gain raid leadership, so they won't
ever gain group leadership while leading a raid, even if they don't
end up gaining group due to the restrictions.

From what I can tell, this should be in line with live
2014-10-18 13:27:33 -04:00