pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-04 19:53:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,421 Commits 87 Branches 159 Tags
Commit Graph

587 Commits

Author SHA1 Message Date
KimLS
ca86763c2b Token verification 2014-08-18 20:27:15 -07:00
KimLS
a602640188 Merge branch 'master' into web_interface 2014-08-18 18:36:31 -07:00
Uleat
00321126f1 Merge branch 'master' of https://github.com/EQEmu/Server into clientupdate 
Conflicts:
	changelog.txt
 2014-08-16 18:17:59 -04:00
Uleat
9e1549b61b Fix for invalid handling of heading criteria in Client::Handle_OP_ClientUpdate() 2014-08-16 18:12:21 -04:00
KimLS
a85bb6aca6 Cleanup before push 2014-08-16 15:03:01 -07:00
KimLS
8b08f19628 Merge branch 'master' into DBQuery 2014-08-16 14:12:33 -07:00
Russell Kinasz
1ba4b6fc31 Implemented Raid OOC Regen 2014-08-12 15:18:11 -07:00
KimLS
cb3fa2d4a3 Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-12 14:51:09 -07:00
Arthur Ice
f1b8908c9a Fixed bug with ErrorBuffer being overwritten on non query requests 2014-08-11 13:55:25 -07:00
KimLS
119e0bb0ac Merge branch 'master' into web_interface 2014-08-11 13:51:11 -07:00
KimLS
11abc45e3f Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-11 12:58:53 -07:00
Arthur Ice
321cf17eac fixed issue with row request on null result 2014-08-10 22:27:25 -07:00
Michael Cook
f0c46664d2 Merge pull request #176 from KayenEQ/Development 
ST_PetMaster target type support added
 2014-08-10 23:04:06 -04:00
KayenEQ
8b2dba9715 ST_PetMaster target type support added 
Targets pets master. (Works for regular and swarm pets)
 2014-08-10 20:13:01 -04:00
KimLS
26ff1ae941 Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-10 16:27:59 -07:00
Arthur Ice
12ded4b506 Fixed bug with non row returning queries crashing. 2014-08-10 14:19:35 -07:00
KimLS
2b66af2d91 Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-10 13:23:09 -07:00
Michael Cook (mackal)
8940e987c1 Fix some compiler warnings 2014-08-10 15:56:58 -04:00
KayenEQ
2aec190afc Support for spells_new field 'uninterruptable' 2014-08-08 13:42:14 -04:00
Akkadius
34913c2046 Added client to Zone.Get.Initial.Entity.Positions 
Added type field to Zone.Get.Initial.Entity.Positions
Added method Zone.Move.Entity, currently in test mode
Made modifications to explode function in web_interface_utils.h
 2014-08-07 20:13:37 -05:00
KimLS
dd88d0096b Merge branch 'master' into web_interface 2014-08-04 13:57:43 -07:00
KayenEQ
ef982b9ce2 Implemented 'min_range' field, sets a min range that you must 
be away from target for spell to land.
 2014-08-03 08:21:47 -04:00
Akkadius
7c3cfd43de Stuff 2014-08-03 01:20:19 -05:00
KayenEQ
52d92b7181 Implemented broad support for fields min_dist, min_dist_mod, max_dist, max_dist_mod - 
Scales spell power based on targets distance from caster.
This implemented in a broad way to function with spells
that would make sense to scale. Some work will still be needed on this.

Be aware if making custom
spells not everything will work and certain effects just
should not be included (use common sense).
 2014-08-02 21:10:44 -04:00
KayenEQ
b65d3c85b6 Implemented support for spells_new fields InCombat, OutofCombat 
Required SQL to rename and add new fields to spells_new table.
 2014-08-02 10:42:11 -04:00
KayenEQ
454f2520c3 Support for spells_new field npc_no_los (simply skips the LOS check for that spell 
despite name, no reason to hard code it only for NPC).
 2014-08-01 23:35:35 -04:00
KimLS
40b555a55b More work on subscription events, and relaying through world. 2014-08-01 18:29:41 -07:00
Arthur Ice
e1e219ae97 Merge upstream 2014-08-01 10:41:26 -07:00
Arthur Ice
af57ca3b05 Merge upstream 2014-08-01 10:41:16 -07:00
Uleat
8b14c21a24 More numeric to constant conversions..should be most of them... Please report any inventory abnormalities. 2014-07-31 07:52:38 -04:00
KimLS
002f5e3bcc Work on relay 2014-07-30 20:07:36 -07:00
KimLS
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
Arthur Ice
0f6ce6a1f4 Upstream merge 2014-07-30 14:46:02 -07:00
Uleat
e902373ce7 This DOES fix the GCC issue..sorry for the inconvenience! 2014-07-27 23:05:16 -04:00
Uleat
0ad7c4470b GCC fix for last dictionary push (hopefully) 2014-07-27 22:18:17 -04:00
Uleat
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
KimLS
7359eb01d4 Merge branch 'web_interface' of github.com:EQEmu/Server into web_interface 2014-07-24 19:35:04 -07:00
KayenEQ
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
Chris M
da6d7538b0 Position updates with do_pos_update test call 2014-07-22 23:14:44 -05:00
KimLS
69e90aac0a Racism down, uuid tracking up 2014-07-21 19:22:16 -07:00
KimLS
2dff51a4db Merge branch 'web_interface' of github.com:EQEmu/Server into web_interface 2014-07-20 14:35:54 -07:00
Chris M
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
KimLS
0e0638f11d Merge branch 'master' into web_interface 2014-07-20 12:25:17 -07:00
KayenEQ
089360a3a5 merge 2014-07-18 17:00:39 -04:00
Uleat
d7c2d6108f Added the initial references for two new dictionaries - EmuConstants and EQLimits..more to come. 2014-07-16 21:23:16 -04:00
KimLS
4109b0b88d Merge from master 2014-07-14 15:50:40 -07:00
KimLS
b7e36feeeb Removed more socket server stuff, changed some of the build stuff. 2014-07-14 15:44:28 -07:00
KimLS
658bf04d0b Merge branch 'master' of github.com:EQEmu/Server 2014-07-14 15:10:28 -07:00
KimLS
80892f1d4d Reworking a lot of stuff at once, this will look very chaotic. 2014-07-14 15:09:55 -07:00
Arthur Ice
b43ab783b0 AddReport converted to StringFormat 2014-07-10 22:55:00 -07:00