af57ca3b05
Merge upstream
2014-08-01 10:41:16 -07:00
a98eeb7be6
Merge remote-tracking branch 'upstream/master'
2014-08-01 10:26:38 -07:00
cc0f2ac37a
Changed a few mis-labeled range starts..no functionality change.
2014-07-31 21:05:43 -04:00
842f1fb9c7
Test fix for charm in trader's satchel while trader..thanks demonstar and Derision! ** This may need to be tweaked..but, I was able to test without crashing the client.
2014-07-31 11:41:27 -04:00
8b14c21a24
More numeric to constant conversions..should be most of them... Please report any inventory abnormalities.
2014-07-31 07:52:38 -04:00
002f5e3bcc
Work on relay
2014-07-30 20:07:36 -07:00
780789fbad
More work on getting remote calls up and running, added two remote calls list_zones and get_zone_info.
2014-07-30 15:23:14 -07:00
0f6ce6a1f4
Upstream merge
2014-07-30 14:46:02 -07:00
7aaf9ae00d
Merge remote-tracking branch 'upstream/master'
2014-07-30 14:08:10 -07:00
e902373ce7
This DOES fix the GCC issue..sorry for the inconvenience!
2014-07-27 23:05:16 -04:00
0ad7c4470b
GCC fix for last dictionary push (hopefully)
2014-07-27 22:18:17 -04:00
36a2d52f1c
More 'dictionary' updates..added 'constants' files to client translators..started replacement of hard-coded inventory values.
2014-07-27 20:35:43 -04:00
927580b983
Prelim work on authorization, right now it's hard coded but it will actually check a db at some point
2014-07-25 22:11:58 -07:00
7359eb01d4
Merge branch 'web_interface' of github.com:EQEmu/Server into web_interface
2014-07-24 19:35:04 -07:00
d0756ff2af
Merge pull request #169 from KayenEQ/Development
...
Updates to npc_spells and npc_types table.
2014-07-24 18:44:18 -04:00
9fcea56fbf
Alllow SE_PetMeleeMitigation to work on swarm pets.
2014-07-24 14:06:15 -04:00
1b239b7119
Support for AA derived AC bonus.
2014-07-24 11:31:22 -04:00
83f94da43b
Spell Effect for melee mitigation will no longer use same bonus
...
item shielding effect. Added support for spell effect melee mitigation
to work on as item worn effects and AA.
2014-07-24 11:23:14 -04:00
0d5a0525cd
minor fix
2014-07-23 22:08:47 -04:00
4f07be2343
Update to how bonuses are calculated in chance to hit code to be
...
consistent across all relevant effects (treating avoidance
and hit chance bonuses equally).
Rule ArcheryHitPenalty will now calc correctly (Was doing basically nothing)
New field npc_types 'Avoidance' (add avoidance bonus to npc)
Rules for setting min / max chance to hit
2014-07-23 21:24:21 -04:00
152a7410b6
debug msg removal
2014-07-23 16:57:59 -04:00
9e4a21d934
Allow negative values for avoidance to work. (debuffs)
2014-07-23 13:13:51 -04:00
da6d7538b0
Position updates with do_pos_update test call
2014-07-22 23:14:44 -05:00
69e90aac0a
Racism down, uuid tracking up
2014-07-21 19:22:16 -07:00
6b107d4197
sql fix
2014-07-21 09:46:36 -04:00
2dff51a4db
Merge branch 'web_interface' of github.com:EQEmu/Server into web_interface
2014-07-20 14:35:54 -07:00
e442d682cd
Added rapidjson library
...
Added web_interface_utils.cpp/.h to common to provide string based functions for outputting JSON
Adjusted CMake to include rapidjson library and new web_interface_utils.h/cpp to common
Currently, I have code set up hackishly for testing so do not think it is final. It is merely for demonstrating what I've done and played with.
2014-07-20 15:02:06 -05:00
0e0638f11d
Merge branch 'master' into web_interface
2014-07-20 12:25:17 -07:00
d99f9c1c09
fix for aa pet flurry bonus calc
2014-07-18 17:57:03 -04:00
089360a3a5
merge
2014-07-18 17:00:39 -04:00
5ad7b84415
Fixed memory allocation for socket write, stopgap for now we can probably set a max message out size and cut out allocations all together.
2014-07-16 23:52:52 -07:00
d7c2d6108f
Added the initial references for two new dictionaries - EmuConstants and EQLimits..more to come.
2014-07-16 21:23:16 -04:00
e0bc0e2e5c
Changed websockets lib, protocol not finalized at all
2014-07-15 22:52:18 -07:00
4109b0b88d
Merge from master
2014-07-14 15:50:40 -07:00
b7e36feeeb
Removed more socket server stuff, changed some of the build stuff.
2014-07-14 15:44:28 -07:00
658bf04d0b
Merge branch 'master' of github.com:EQEmu/Server
2014-07-14 15:10:28 -07:00
80892f1d4d
Reworking a lot of stuff at once, this will look very chaotic.
2014-07-14 15:09:55 -07:00
b43ab783b0
AddReport converted to StringFormat
2014-07-10 22:55:00 -07:00
be90b4e0cc
CheckLogin converted to StringFormat
2014-07-10 22:53:20 -07:00
b3895f717a
GetGuildIDByCharID converted to StringFormat
2014-07-10 22:19:14 -07:00
77a5d82de4
GetAdventureStats converted to StringFormat
2014-07-10 22:19:07 -07:00
a7ac4b8deb
UpdateAdventureStatsEntry converted to StringFormat
2014-07-10 22:19:01 -07:00
9cd2225f8c
GlobalInstane converted to StringFormat
2014-07-10 22:04:58 -07:00
f2e7f8ec64
SetInstanceDuration converted to StringFormat
2014-07-10 21:30:17 -07:00
899c34ff63
AssignRaidToInstance converted to StringFormat
2014-07-10 21:30:11 -07:00
79819a85d6
AssignGroupToInstance converted to StringFormat
2014-07-10 21:30:05 -07:00
e66b4e4a3d
GetCharactersInInstance converted to StringFormat
2014-07-10 21:29:59 -07:00
48c24186d1
sql comment fix
2014-07-10 23:44:03 -04:00
965bb039be
Updates to npc_spells and npc_types table.
...
Implemented innate defensive and range procs
Implemented ability to fine tune AI casting behavior/timers
Global rules for AI casting behavior/timers
NPC Ranged attack updates, set skill and ammo type in npc_types
Various clean ups in attack related functions.
Other minor fixes.
See Change Log, +required, +optional SQL
2014-07-10 22:46:39 -04:00
d606d8f4f2
GetInstanceID converted to StringFormat
2014-07-10 17:56:53 -07:00
Arthur Ice
Uleat
KimLS
Michael Cook
KayenEQ
Chris M