Commit Graph
100 Commits
Author SHA1 Message Date
KimLS 5a7a2b0aef Wanted test to account for quest request 2014-10-12 14:49:04 -07:00
KimLS 45b83feb99 Fix for file loading 2014-10-12 14:41:53 -07:00
KimLS f4621bd5c0 Fix for crash when sending too large a response packet, less efficient but should handle every packet type now. Can retool if allocations end up being a problem. 2014-10-11 15:44:27 -07:00
KimLS 06f7f6b483 Fix for quest stuff loading junk from a file. Also will properly memset the entire buffer 2014-10-11 02:15:36 -07:00
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
Alex 69b7d500d8 Merge pull request #180 from EQEmu/clientupdate
Clientupdate
2014-08-16 22:23:19 -07:00
KimLS a85bb6aca6 Cleanup before push 2014-08-16 15:03:01 -07:00
KimLS 9207220238 Merge branch 'DBQuery' 2014-08-16 15:02:19 -07:00
KimLS 539c09adc5 Merge branch 'master' into DBQuery 2014-08-16 15:00:38 -07:00
KimLS 8b08f19628 Merge branch 'master' into DBQuery 2014-08-16 14:12:33 -07:00
Alex adc801a069 Merge pull request #179 from KinglyKrab/master
Fixed GetItemStat making all information it pulls default as uint32.
2014-08-15 22:47:27 -07:00
Alex eb609f2ea4 Merge pull request #178 from KinglyKrab/master
Fixes uint32 max value issue.
2014-08-15 22:00:26 -07:00
KimLS cb3fa2d4a3 Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-12 14:51:09 -07:00
KimLS b9e6a1f5eb Fixed param problem with zone/world, also please don't put excessive periods in function names... thank.you.please.for.the.love.of.god 2014-08-11 14:10:24 -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
KimLS 26ff1ae941 Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-10 16:27:59 -07:00
KimLS 2b66af2d91 Merge branch 'RunQueryToDatabaseQuery_database' of https://github.com/addtheice/Server into DBQuery 2014-08-10 13:23:09 -07:00
KimLS d7eb28c7f8 Travis CI file 2014-08-10 02:45:21 -07:00
KimLS c6d8b7e337 More generic method handlers now 2014-08-05 14:30:23 -07:00
KimLS 2ed960d733 Cleanup of various things, made writing method handlers in web_interface easier now you just have to check args 2014-08-04 14:35:10 -07:00
KimLS dd88d0096b Merge branch 'master' into web_interface 2014-08-04 13:57:43 -07:00
KimLS 379ecc655c Changed a bunch of function names to be shorter but still descriptive 2014-08-02 14:31:39 -07:00
KimLS ae30d8b257 More cleanup 2014-08-01 19:07:54 -07:00
KimLS 40b555a55b More work on subscription events, and relaying through world. 2014-08-01 18:29:41 -07: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
KimLS 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
KimLS 7359eb01d4 Merge branch 'web_interface' of github.com:EQEmu/Server into web_interface 2014-07-24 19:35:04 -07: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
KimLS 0e0638f11d Merge branch 'master' into web_interface 2014-07-20 12:25:17 -07: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
KimLS e599820383 Missing return value 2014-07-08 21:09:56 -07:00
KimLS 7048fcc358 Fix for GCC+11 compile 2014-07-08 21:09:56 -07:00
KimLS b7cc19f983 Removed older AZone build options, use eqemu-zone-utils instead 2014-07-08 21:09:53 -07:00
KimLS 9680f39203 Some potential fixes for clang, not complete 2014-07-08 21:09:52 -07: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
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
KimLS eb62481766 Missing return value 2014-07-03 23:35: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
Alex 127682cc84 Merge pull request #161 from addtheice/DatabaseInterface
Database interface
2014-07-03 19:31:36 -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
KimLS 2ef6d3f93e Removed older AZone build options, use eqemu-zone-utils instead 2014-06-30 14:09:03 -07:00
KimLS a6589e283b Some potential fixes for clang, not complete 2014-06-23 16:56:37 -07:00
KimLS 308562f939 Work around for msvc tuple bug 2014-06-16 15:09:17 -07:00
KimLS a1adda36fa Experimental changes to lua get_qglobal implementation to try to see if we can figure out this gcc x86 bug. 2014-06-08 15:18:48 -07:00
KimLS e9c4613368 Merge branch 'master' into water_map_v2 2014-06-04 18:32:48 -07:00
KimLS 3690f93302 Fix for fear failing, removed #fear command because it was blank anyway, added a cmake command to change the default map/water/path directory 2014-05-31 16:32:15 -07:00
KimLS dd73b82ec2 Fix for a problem with global player quests and hasquestsub 2014-05-27 16:16:06 -07:00
KimLS 8a5405060f Fix for string.h missing in water map 2014-05-23 17:39:16 -07:00
KimLS 83270d0983 Merge from master stuff 2014-05-23 16:10:23 -07:00
KimLS fd4343702f Merge branch 'master' into water_map_v2 2014-05-23 16:09:46 -07:00
KimLS 0483e8bd1b Removed the logging now that the issue is resolved 2014-05-23 16:08:02 -07:00
KimLS 39cbdbd5c2 Debug logs for map, also can actually turn perl off on zone 2014-05-23 15:54:26 -07:00
KimLS 3a2ccd7521 Added loading of v2 regular maps, also #bestz will report water info even if a reg map failed to load. 2014-05-21 17:30:54 -07:00
KimLS 8c92271804 Initial v2 water map format. 2014-05-20 00:14:26 -07:00
KimLS 670c5e2e1a Fix for crash in loading loot drops when you hit the actual lootdrop entry limit of 1260 2014-05-09 15:06:33 -07:00
KimLS a2e86ebec5 Some compile fixes for older versions of C++ on windows 2014-04-29 17:49:17 -07:00
KimLS c6b637e5a5 Changelog 2014-04-29 13:05:45 -07:00
KimLS 0c9d640683 Merge branch 'master' into raycast 2014-04-29 13:01:26 -07:00
KimLS 6ad4a95cc6 And of course memset too way to not include the whole error message the first time jerk 2014-04-28 13:15:43 -07:00
KimLS d652cc8ea4 Raycastmesh missing malloc, free, NULL refs 2014-04-28 13:10:11 -07:00
KimLS 989bffee81 Merge branch 'master' into raycast 2014-04-27 14:36:05 -07:00
KimLS 5e81848445 Darwin caused ipc mutex to stop working for non-darwin, non-windows systems. Hopefully fixed 2014-04-25 18:45:19 -07:00
Alex e047d99a6c Merge pull request #138 from Corysia/master
Changes for intel Mac OSX build
2014-04-25 13:47:48 -07:00
KimLS c16fe3c810 CMake flags to defining what is logged and where 2014-04-20 17:46:43 -07:00
KimLS 635d28cd65 Change to how quest signals work 2014-04-20 17:26:51 -07:00
KimLS 8db6060089 Renamed errant sql file. 2014-04-05 16:07:13 -07:00
KimLS d1ecb32652 Fix for crash in EntityList::MobInZone(Mob *who) when a dangling pointer is passed to the function. Which used to work without crashing but was changed at some point which can be triggered by quests in some situations. 2014-04-04 12:27:18 -07:00
Alex 2781f82d29 Merge pull request #134 from addtheice/master
Tests for hextoi, hextoi64, atobool
2014-03-17 22:34:58 -07:00
Alex f809f503c9 Merge pull request #131 from Siroro/master
Pull Request from Siroro/Server
2014-03-17 22:34:20 -07:00
KimLS 39abb4f50c Changed how item faction bonuses are cleared. 2014-03-10 16:43:33 -07:00
KimLS 93105966b6 Added some missing bufffadebyx functions to lua mob 2014-03-09 18:41:50 -07:00
KimLS 2e4b4b94ed Memory leak work around for perl, should play better with events that call other events now. 2014-03-09 17:55:24 -07:00
KimLS 1476ebdfe6 Merge branch 'timer' 2014-03-07 20:00:11 -08:00
KimLS e25fd47828 Added some other timer functions to lua, removed perl memory leak stop gap for the moment until i decide how to fix it... 2014-03-07 19:59:44 -08:00
KimLS 629f9863ae Merge branch 'master' into raycast 2014-03-01 17:49:21 -08:00
KimLS 951c321ba6 Partial port of der's map rewrite, no new azone format yet but it's coming. Will convert legacy map formats on the fly atm. 2014-02-23 21:17:28 -08:00
KimLS eabea6ea16 RaycastMesh work der started I'm going to pick up... 2014-02-23 17:14:50 -08:00
KimLS 5a6c25887a Export of eq.clock(), os.clock() isn't a good option on unix 2014-02-22 15:26:18 -08:00
KimLS 0e44a3625c Merge branch 'master' of github.com:EQEmu/Server 2014-02-22 15:04:18 -08:00
KimLS 476dc6e783 SetDestructibleObject exported to lua 2014-02-22 15:04:01 -08:00
KimLS e09adbd13d Added cmake options to alter eqstream settings if one would so wish. 2014-02-12 15:51:20 -08:00
KimLS 275f9d6aaf Changed SpecialAttacks to an array instead of a map. Basic access was causing a hotspot. Brief testing doesn't show any obvious bugs but let me know if any prop up. 2014-02-12 15:26:08 -08:00
KimLS 1ec0add76f Make sure some strings coming from the client are actually null terminated. 2014-02-10 21:00:25 -08:00
KimLS 8b1262b198 Export clear_npctype_cache as both lua/perl general functions. 2014-02-01 14:55:51 -08:00
KimLS 6e0a214bcc Compiler option for playing with npctype_cache as was requested for a feature. Not entirely tested may need some work. Currently defaults to old behavior on #repop. 2014-01-31 20:38:32 -08:00
KimLS 88ba962a4c Merge branch 'master' of github.com:EQEmu/Server 2014-01-16 13:08:24 -08:00