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
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
KimLS
e0bc0e2e5c
Changed websockets lib, protocol not finalized at all
2014-07-15 22:52:18 -07: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
JJ
a96784aa18
Minor typos.
2014-07-09 19:19:51 -04:00
Michael Cook (mackal)
4707e0f858
Inline a few functions that should be
2014-07-08 21:21:44 -04:00
Michael Cook
fc721b8ec8
Merge pull request #167 from KayenEQ/Development
...
Development
2014-07-08 21:18:53 -04:00
KayenEQ
2918f6bc07
removal of debug msg
2014-07-08 18:27:31 -04:00
KayenEQ
b27ff80c75
fix for random int -> float error
2014-07-08 08:04:56 -04:00
KimLS
9e3e8dbfa6
Cleaned up web interface server, starting work on getting tcp connections to persist then will hook it up to the websockets/http/whatever else we deem worthy.
2014-07-07 22:19:46 -07:00
Alex
0e0dee3d3d
Merge pull request #168 from addtheice/mysql_fetch_lengths_interface
...
Mysql fetch lengths interface
2014-07-07 19:36:08 -07:00
KayenEQ
d22d0a8145
Update to how FcBaseEffect focus modifies SE_SkillAttack damage.
2014-07-06 20:13:19 -04:00
Arthur Ice
c175369ff6
string based QueryDatabase
2014-07-06 16:15:54 -07:00
Arthur Ice
923adc3ea5
Added FieldName for column name requests
2014-07-06 16:01:10 -07:00
KayenEQ
0e438942e4
Complete revision of SE_SkillProc, SE_LimitToSkill,
...
SE_SkillProcSuccess (now implemented correctly)
to function more accurately and efficiently, AA supported.
This may need to be updated in the future, if more live
spells readily become avialable to test with.
2014-07-06 18:58:16 -04:00
KimLS
74f07f8e19
Merge conflict
2014-07-06 15:26:58 -07:00
KimLS
44aa1285ee
Merge conflict resolution
2014-07-06 15:24:48 -07:00
KimLS
122d180f02
Changed some headers that seemed to conflict on slightly older versions of msvc
2014-07-06 15:22:58 -07:00
Arthur Ice
d514eef59b
Added LengthOfColumn method because of stupid BLOBs
2014-07-05 10:20:28 -07:00
KayenEQ
3a4e72e3e7
Merge git://github.com/EQEmu/Server into Development
2014-07-04 23:38:24 -04:00
KayenEQ
58d585e2a6
Updated SE_Sanctuary - Adjust way hate lowering effect worked to be more accurate
...
Updated SE_SympatheticProc - Revised proc rate formula to be accurate to live.
Sympathetic foci on items with proc rate mod will now benefit from that modifier.
Sympathetic foci can now be placed on AA's (This should always be slot1 in the AA)
Implemented SE_IllusionPersistence- Allows illusions to last until you die or the illusion is forcibly removed.
Added rule 'PreNerftBardAEDot' for SE_BardAEDot to allow it to once again do damage to moving targets. (Set to true)
2014-07-04 23:35:15 -04:00
Michael Cook
9a76df62dd
Merge pull request #165 from KayenEQ/Development
...
Implemented SE_Sanctuary - Places caster at bottom hate list,
2014-07-04 15:59:16 -04:00
KayenEQ
fe5416958a
Merge branch 'Development' of github.com:KayenEQ/Server into Development
2014-07-04 14:24:49 -04:00
Michael Cook (mackal)
3b9e9ae0fd
Hopefully fix compile issue with some VS versions
2014-07-04 13:57:09 -04:00
Arthur Ice
773ab21085
Merge remote-tracking branch 'upstream/master'
2014-07-03 23:38:30 -07:00
KimLS
eb62481766
Missing return value
2014-07-03 23:35:19 -07:00
Arthur Ice
6197fb07e1
Merge remote-tracking branch 'upstream/master'
2014-07-03 23:09:19 -07:00
KimLS
c9830dff57
Merge branch 'master' of https://github.com/EQEmu/Server into clang
2014-07-03 21:49:39 -07:00
KimLS
192f9f0cb5
Fix for GCC+11 compile
2014-07-03 21:49:14 -07:00
Michael Cook (mackal)
e599555ddb
Fix case-sensitive issue
2014-07-04 00:46:53 -04:00
Arthur Ice
328cce33b9
Merge remote-tracking branch 'upstream/master'
2014-07-03 19:44:59 -07:00
Alex
127682cc84
Merge pull request #161 from addtheice/DatabaseInterface
...
Database interface
2014-07-03 19:31:36 -07:00
Arthur Ice
065db3b396
Merge remote-tracking branch 'upstream/master'
2014-07-03 19:20:03 -07:00
Chris M
c645b81890
Removing socket server from cmake for now and maintaining it in its own branch until push to master
2014-07-03 18:16:43 -05:00
Arthur Ice
2734307ba2
Added LastInsertID() to MySQLRequestResult
2014-07-03 15:48:17 -07:00
Arthur Ice
53fd5e0a5c
Merge remote-tracking branch 'upstream/master'
2014-07-03 15:05:22 -07:00
KimLS
f866fd59d9
Merge problem
2014-07-03 14:14:14 -07:00
KimLS
d6da569fc6
Auto-commit.
2014-07-03 14:11:06 -07:00
KayenEQ
5a30d3ed03
Update SE_InterruptCasting: Will now work for instant spells (as well as over time).
2014-07-03 11:37:38 -04:00
KayenEQ
28493488ac
Updated SE_BardAEDot to no longer damage target while target is moving (consistent with live)
2014-07-03 11:00:23 -04:00
KayenEQ
0d2127f874
Changed SE_LimitMaxMana to SE_MeleeVulnerability - Weakness/Mitigation verse melee damage
...
(Despite lives SPA lable as the former it clearly is not what the effect does from all spell examples)
2014-07-03 10:55:59 -04:00
KayenEQ
ee741048e9
Implemented SE_LimitSpellClass - Focus Limits spell to pre defined categories. (3=Cures,3=Offensive, 6=Lifetap)
2014-07-03 08:48:27 -04:00
Chris M
7ec0994433
Cleanup
2014-07-03 04:15:00 -05:00
Chris M
90f74d6847
More Socket Server work. Made Socket server a by default disabled option in the CMake configuration while development is underway. For now, do not use.
2014-07-03 03:25:58 -05:00
Chris M
a92b4c04e9
Initial Socket Server implementation with CMakeLists.txt updated. Socket server will connect to world at this point.
2014-07-02 22:17:45 -05:00
KayenEQ
8453d5bc48
Renamed various Cast on Fade spell effects to more accurately describe their functions.
...
Missing code from prior commit.
2014-07-02 21:38:26 -04:00
KayenEQ
542c0913d6
Re-Implemented SE_TriggerMeleeThreshold and SE_TriggerSpellThreshold correctly - Trigger spell if owner of buff
...
takes more than the specified damage amount in a SINGLE hit, then fade the buff.
2014-07-02 14:00:50 -04:00
