swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity
596 Commits 10 Branches 0 Tags
5a082e5f1de1d090eaee3f2f396c018dbd94fd9b
Commit Graph
596 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
swg 5a082e5f1d changing the submitted data of the webstatistics stuff 2016-05-06 00:18:28 +01:00
swg b0d577bc36 i rather do this 2016-05-05 19:55:02 +01:00
DarthArgus 16c9ba95d0 add ConfigCentralServer::getMetricsDataURL() and move the stats collection functionality to the function that sends to the login server; this may or may not be optimal depending on how often it is updated 2016-05-05 16:04:41 +00:00
DarthArgus ade6e1f1d0 we only use this var once, no reason to keep it... 2016-05-05 14:34:47 +00:00
DarthArgus 8c0d9beb5d fixed noobs' commits, this is mostly good except we need to add a config variable to the config for central 2016-05-05 14:27:27 +00:00
swg 87ae60bba6 this time 2016-05-05 08:41:44 +01:00
swg b66fd34d80 Revert "Revert "help me, this doesnt build at all .."" 
This reverts commit 663a7c9988.
 2016-05-05 08:36:42 +01:00
swgnoobs 71e0888cd2 Merge branch 'revert-dc2b683c' into 'testing' 
Revert "help me, this doesnt build at all .."

Stupid Editor automakes nullptr out of NULL ....

See merge request !25
 2016-05-05 07:27:51 +00:00
swgnoobs 663a7c9988 Revert "help me darthargus, this doesnt build at all .." 
This reverts commit dc2b683c42
 2016-05-05 07:26:26 +00:00
DarthArgus 068228a938 forgot a case 2016-04-28 19:52:24 +00:00
DarthArgus 18e316631f credit where it's due 2016-04-28 19:17:47 +00:00
DarthArgus 909ceab5e9 poke some fun with license header 2016-04-28 17:27:27 +00:00
DarthArgus 6049da78af all working! thanks for the cmake help, @devcodex! 2016-04-28 17:23:30 +00:00
DarthArgus 3a3b8e0b2a re-stubify this as all it does is hide real errors 2016-04-28 17:10:03 +00:00
DarthArgus b99e3e45f9 properly link the executable against curl, instead of the helper lib 2016-04-28 16:57:47 +00:00
DarthArgus ecc0621f61 if only i could get past the linker errors, this will work... 2016-04-28 03:46:02 +00:00
DarthArgus 5f7cf7e969 this is closer but still not building correctly 2016-04-28 03:28:12 +00:00
DarthArgus 4f7a729d61 this makes more sense 2016-04-27 22:27:18 +00:00
DarthArgus baecfbebb6 has linker error! but this should be a good start on breaking out our changes and web api into a standalone library/namespace 2016-04-27 21:54:10 +00:00
DarthArgus 52672794fe actually, i'll strip the array on the php side 2016-04-24 18:37:18 +00:00
DarthArgus f25da4f7f2 i'm a doofus and failed to notice the message is being returned as an array 2016-04-24 18:36:16 +00:00
DarthArgus 5fc9a0e689 TEMP FIX HACK TODO - for whatever reason spaced strings seem to return as arrays when using the json parser's .get function 2016-04-24 18:14:31 +00:00
DarthArgus 1507b19b3a this properly sends all the data; @devcodex please do a review on this as i'm not 100% sure all these types i'm using (or vars) are necessary 2016-04-24 09:13:15 +00:00
DarthArgus e2d9042667 better way...since the last one was broken 2016-04-24 07:01:36 +00:00
DarthArgus 38f5a50bb6 Merge remote-tracking branch 'origin/testing' into testing 2016-04-24 06:56:47 +00:00
DarthArgus f273239cfb use existing var 2016-04-24 06:55:46 +00:00
swg ad4c22b008 Merge branch 'testing' of stellabellum.net:staff/src into testing 2016-04-21 22:07:49 +01:00
swg 2375f62ccf Adding serverinfo command 2016-04-21 22:07:01 +01:00
DarthArgus 7f1c59a44c just evaluate these as bools 2016-04-18 20:02:49 +00:00
DarthArgus a82bb979d7 reduce code complexity/readability, hopefully make slightly faster 2016-04-18 19:52:56 +00:00
DarthArgus cb1035d40e Revert "remove more dead code" 
This reverts commit 7d03daec7d.
 2016-04-18 03:57:01 +00:00
DarthArgus 9aeea8732e Revert "remove station related session code" 
This reverts commit 0e22ecd027.
 2016-04-18 03:56:57 +00:00
DarthArgus 64a4daada5 add a more proper check to look for an empty string 2016-04-17 22:50:41 +00:00
DarthArgus 8bce22b7b1 remove "wtf" debug test line 2016-04-17 22:42:13 +00:00
DarthArgus 72f11faa33 remove debug line 2016-04-17 22:38:08 +00:00
DarthArgus 99a267b59f add ip address and station id to our request so we can alias them in the db on the php side (todo) 2016-04-17 22:26:56 +00:00
DarthArgus 1405ff948d finally this bitch is working with the php auth system 2016-04-17 22:21:56 +00:00
DarthArgus a10e8c28cd let's use post 2016-04-17 19:21:45 +00:00
DarthArgus a76c5dd70b make things more standardized 2016-04-17 19:17:41 +00:00
DarthArgus 7d03daec7d remove more dead code 2016-04-17 04:42:28 +00:00
DarthArgus 0e22ecd027 remove station related session code 2016-04-17 04:38:16 +00:00
DarthArgus 81b05726ce catch any stupid or lazy mistakes that could be made... 2016-04-17 02:13:05 +00:00
DarthArgus 61298b7468 add "json for modern c++" json.hpp file and implement it; it is in a higher level dir so we can add it elsewhere if need be; up next we want to add an option to have an endpoint GET requested on character creation with the suid and character name 2016-04-17 02:06:13 +00:00
DarthArgus c7f986bafc remove redundant call 2016-04-16 23:58:01 +00:00
DarthArgus 600a78cfe1 add skeleton of auth system based on previous work by parz1val, you need to install libcurl4-gnutls-dev (libcurl4-gnutls-dev:i386 if a 64 bit host) 2016-04-16 23:26:43 +00:00
DarthArgus 6a8538e251 remove superfluous if statement 2016-04-16 19:58:39 +00:00
DarthArgus 95961e4a74 according to GCC, no it isn't - fixes a warning 2016-03-24 21:54:12 +00:00
DarthArgus 8d44908b4b this seems to have been test code...we can reenable if something feels missing later 2016-03-24 21:52:27 +00:00
DarthArgus 5ed117d9c7 having these here just leaves unnecessary server crash risks...we'll just ignore these instead of crashing if we get any 2016-03-24 21:43:51 +00:00
DarthArgus cd997925eb cleanup all the "#if 1" macro blocks 2016-03-24 21:27:54 +00:00