Commit Graph

Select branches

Hide Pull Requests

master

testing

testing-64

Mono Color

• c3a4707623 back to stock DarthArgus 2017-01-01 18:02:40 +00:00
• cce8140c5f Revert "remove a check that was malfunctioning" DarthArgus 2017-01-01 17:50:33 +00:00
• 3efe5c9759 remove a check that was malfunctioning DarthArgus 2017-01-01 17:31:46 +00:00
• 5a693791f6 add seemingly redundant check to allow godmode properly DarthArgus 2017-01-01 17:22:10 +00:00
• de68ba41ea logical fixes DarthArgus 2017-01-01 10:07:12 -06:00
• 1383b6db6b autoformat DarthArgus 2017-01-01 05:56:45 -06:00
• ba7858389a remove debug output DarthArgus 2017-01-01 11:55:38 +00:00
• 86f4848dee correct this DarthArgus 2017-01-01 05:18:53 -06:00
• 019affa036 this may actually fix it DarthArgus 2017-01-01 05:17:17 -06:00
• fb57bdb8d3 more debug messages DarthArgus 2017-01-01 05:08:37 -06:00
• b9162a27b6 keep orig length DarthArgus 2017-01-01 10:36:56 +00:00
• 9da25e111c helps when you have the proper number of brackets DarthArgus 2017-01-01 02:41:44 -06:00
• b39fcbed73 probably helps if we actually set this DarthArgus 2017-01-01 02:40:16 -06:00
• d9ee0d8950 is it a length issue? DarthArgus 2017-01-01 02:33:55 -06:00
• cb5a50ebf6 Merge branch 'testing' of git.stellabellum.net:staff/src into testing DarthArgus 2017-01-01 02:14:52 -06:00
• 759587cb0a this may work... DarthArgus 2017-01-01 02:14:37 -06:00
• 63888363e4 wtf DarthArgus 2017-01-01 07:55:12 +00:00
• 752737c494 more debgu DarthArgus 2017-01-01 01:53:55 -06:00
• c5e887b47f Merge branch 'testing' of git.stellabellum.net:staff/src into testing DarthArgus 2017-01-01 01:33:09 -06:00
• 2cd0af76e3 getting closer, but no cigar DarthArgus 2017-01-01 06:23:47 +00:00
• 0328338e8c more debug DarthArgus 2016-12-31 23:11:03 -06:00
• 10ba962aa5 debug output DarthArgus 2016-12-31 22:51:02 -06:00
• d4a8cd1dc9 this may make more sense DarthArgus 2017-01-01 04:45:34 +00:00
• a00bff8842 this may just work DarthArgus 2016-12-31 22:35:15 -06:00
• b144bbd265 maybe get closer... DarthArgus 2016-12-31 21:56:41 -06:00
• a0f86b45e7 also dumb DarthArgus 2017-01-01 03:51:21 +00:00
• 0e6ac65c2a dumb of me DarthArgus 2016-12-31 21:49:22 -06:00
• 46d49e9bac i know this is probably broken but i'll get it working DarthArgus 2016-12-31 21:13:11 -06:00
• 772fef6fb3 Merge branch 'testing' DarthArgus 2017-01-01 01:51:34 +00:00
• 778ba0b02f Merge our maddening fixes DarthArgus 2017-01-01 01:50:55 +00:00
• eca10ff5ab fix the character mismatching and orphaning issue; we still should tidy the mixed use of StationId, uint32 (typedef override to unsigned long by SOE), long, and unsigned long for the station id value all over the code base...way to go, Smed DarthArgus 2017-01-01 01:46:34 +00:00
• bb842aa187 use ints for the subaccounts and account ids DarthArgus 2016-12-31 23:59:15 +00:00
• ddc83f77a0 stdc++6.x fixes DarthArgus 2016-12-31 20:41:46 +00:00
• 86b8d23865 stdc++6 build fixes DarthArgus 2016-12-17 19:55:13 +00:00
• e121ceb99f seriously why you idiots DarthArgus 2016-12-31 19:15:59 +00:00
• a15c0430f0 %zu and some safeguards DarthArgus 2016-12-31 17:57:59 +00:00
• b309289c7f sanity checks and such DarthArgus 2016-12-31 17:15:25 +00:00
• 541bbe891e sanity checks and such DarthArgus 2016-12-31 17:15:25 +00:00
• 7900170fb1 sanity checks and such DarthArgus 2016-12-31 17:15:25 +00:00
• f0e61146b3 silence warn DarthArgus 2016-12-31 08:23:11 +00:00
• 1550e3df19 silence warn DarthArgus 2016-12-31 08:23:11 +00:00
• e8e4536ee5 silence warn DarthArgus 2016-12-31 08:23:11 +00:00
• 6135ce8318 curl: don't verify peer because we use cloudflare DarthArgus 2016-12-31 00:11:15 -06:00
• 3c010bc41a Merge branch 'testing' DarthArgus 2016-12-31 00:11:39 -06:00
• 80b86005f7 curl: don't verify peer because we use cloudflare DarthArgus 2016-12-31 00:11:15 -06:00
• 4cd7af3972 Merge branch 'master' of 45.166.161.136:staff/src DarthArgus 2016-12-31 00:10:02 -06:00
• 725a2e95cf Merge branch 'testing' of git.stellabellum.net:staff/src into testing DarthArgus 2016-12-29 09:11:56 -06:00
• 5d06acd992 Merge branch 'testing' into clang-profile-build DarthArgus 2016-12-29 15:09:45 +00:00
• 882bd10739 Merge branch 'testing' DarthArgus 2016-12-29 15:09:23 +00:00
• 4f347f0d22 if this fixes our issue it's a one liner...wow DarthArgus 2016-12-29 10:05:29 +00:00
• 4a0528fea2 Merge branch 'testing' of git.stellabellum.net:staff/src into testing DarthArgus 2016-12-29 02:56:41 -06:00
• 0995323201 move these to before and after as they were before the changes DarthArgus 2016-12-29 08:53:48 +00:00
• 81d679e0cc Merge branch 'testing' of stellabellum.net:staff/src into testing DarthArgus 2016-12-29 08:48:31 +00:00
• 9e8beefada general cleanup; remove those mutexes and debug output as they didn't get us anywhere DarthArgus 2016-12-29 08:45:40 +00:00
• dd9d5ae6bd more tracking of creation DarthArgus 2016-12-29 07:16:48 +00:00
• 227ffe97fc Merge branch 'testing' of git.stellabellum.net:staff/src into testing DarthArgus 2016-12-29 01:30:27 -06:00
• 318eb0353e here's hoping these are enough DarthArgus 2016-12-29 07:16:48 +00:00
• 8f48391b79 trying to figure out where i'm causing us to hang DarthArgus 2016-12-29 00:59:54 -06:00
• ef1b4d90d6 try a mutex to see if it keeps us from deleting our playerobjects DarthArgus 2016-12-29 00:15:28 -06:00
• af37f5b847 get better warning/error output on character creation failures DarthArgus 2016-12-29 04:28:37 +00:00
• 931e9f184c Revert "It's 2016 and C++11 supports these natively" DarthArgus 2016-12-28 23:16:42 +00:00
• 85fb5af930 Revert "It's 2016 and C++11 supports these natively" DarthArgus 2016-12-28 23:16:34 +00:00
• b8280bad64 Revert "It's 2016 and C++11 supports these natively" DarthArgus 2016-12-28 22:37:02 +00:00
• cc297fcea1 this works even though it doesn't look right DarthArgus 2016-12-28 21:56:24 +00:00
• 7677048f33 this works even though it doesn't look right DarthArgus 2016-12-28 21:56:24 +00:00
• 2f85f221ba this works even though it doesn't look right DarthArgus 2016-12-28 21:56:24 +00:00
• 9a187477f6 clean up the login server output DarthArgus 2016-12-28 19:01:59 +00:00
• e447aef1a3 clean up the login server output DarthArgus 2016-12-28 19:01:59 +00:00
• 01988628d2 clean up the login server output DarthArgus 2016-12-28 19:01:59 +00:00
• 1b114e70cf check for gm in ConsoleCommandParserScript DarthArgus 2016-12-27 19:59:17 +00:00
• f7625d1689 check for gm in ConsoleCommandParserScript DarthArgus 2016-12-27 19:59:17 +00:00
• 058bcd9b3d check for gm in ConsoleCommandParserScript DarthArgus 2016-12-27 19:59:17 +00:00
• 9cf6378076 well, that would do it DarthArgus 2016-12-27 09:27:38 +00:00
• c0a8f592db remove my currently unused code for blacklisting people as iptables seems to suffice DarthArgus 2016-12-27 00:00:02 -06:00
• 8e00d9ece7 remove my currently unused code for blacklisting people as iptables seems to suffice DarthArgus 2016-12-27 00:00:02 -06:00
• 3598780d0c well, that would do it DarthArgus 2016-12-27 09:27:38 +00:00
• ea9e3d87a0 well, that would do it DarthArgus 2016-12-27 09:27:38 +00:00
• 4c6e7eba94 Merge branch 'testing' DarthArgus 2016-12-27 00:01:53 -06:00
• 8571f0c9f4 remove my currently unused code for blacklisting people as iptables seems to suffice DarthArgus 2016-12-27 00:00:02 -06:00
• 694e5b316c sync complete DarthArgus 2016-12-26 23:52:38 -06:00
• 35e92f519f cleanup DarthArgus 2016-12-26 23:49:59 -06:00
• 4ce4bd13d6 this works, incoming cleanup DarthArgus 2016-12-27 05:40:47 +00:00
• 5ec6bb4d74 gosh oracle i hate you DarthArgus 2016-12-26 21:58:29 -06:00
• 6eafb0d7f8 clean webapi DarthArgus 2016-12-26 21:54:21 -06:00
• c6c445b09b clean a bit DarthArgus 2016-12-26 21:53:46 -06:00
• 892390b1b8 closer DarthArgus 2016-12-27 03:49:14 +00:00
• 9904f2e271 cleanups DarthArgus 2016-12-27 02:38:50 +00:00
• d0e630bf43 i mean...fix it DarthArgus 2016-12-27 00:45:49 +00:00
• c47ba0e1bf fix build DarthArgus 2016-12-27 00:45:15 +00:00
• 7a735068d5 sync with current tc and live code DarthArgus 2016-12-27 00:17:41 +00:00
• 9fcb8a7029 cleanup DarthArgus 2016-12-26 15:04:50 -06:00
• de998e1905 are ya kidding me? DarthArgus 2016-12-26 15:01:20 -06:00
• 1ee12bcb3b yay syntax DarthArgus 2016-12-26 15:00:05 -06:00
• 05d7edd012 further fixups DarthArgus 2016-12-26 14:58:28 -06:00
• 4396ba1e33 typos, yay! DarthArgus 2016-12-26 14:57:02 -06:00
• 9a2fa152f1 fixups DarthArgus 2016-12-26 14:55:08 -06:00
• 8e77344357 whoops DarthArgus 2016-12-26 14:52:42 -06:00
• c99fee4802 in theory this will work DarthArgus 2016-12-26 14:50:53 -06:00
• 39d41ee779 first try at nesting code, minus the actual insert DarthArgus 2016-12-26 14:31:06 -06:00
• a93bb14657 modify our count function and add the upserter function DarthArgus 2016-12-26 14:20:16 -06:00