swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-30 00:15:47 -04:00
Code Issues Projects Releases Wiki Activity
1,057 Commits 3 Branches 0 Tags
4a0528fea2208ea6dcfa142e4f08aff279eeccbf
Commit Graph
536 Commits
Author SHA1 Message Date
DarthArgus 4a0528fea2 Merge branch 'testing' of git.stellabellum.net:staff/src into testing 2016-12-29 02:56:41 -06:00
DarthArgus 0995323201 move these to before and after as they were before the changes 2016-12-29 08:53:48 +00:00
DarthArgus 9e8beefada general cleanup; remove those mutexes and debug output as they didn't get us anywhere 2016-12-29 08:47:16 +00:00
DarthArgus dd9d5ae6bd more tracking of creation 2016-12-29 08:47:03 +00:00
DarthArgus 227ffe97fc Merge branch 'testing' of git.stellabellum.net:staff/src into testing 2016-12-29 01:30:27 -06:00
DarthArgus 318eb0353e here's hoping these are enough 2016-12-29 07:16:48 +00:00
DarthArgus 8f48391b79 trying to figure out where i'm causing us to hang 2016-12-29 00:59:54 -06:00
DarthArgus ef1b4d90d6 try a mutex to see if it keeps us from deleting our playerobjects 2016-12-29 00:15:28 -06:00
DarthArgus af37f5b847 get better warning/error output on character creation failures 2016-12-29 04:28:37 +00:00
DarthArgus 2f85f221ba this works even though it doesn't look right 2016-12-28 21:56:24 +00:00
DarthArgus 9a187477f6 clean up the login server output 2016-12-28 19:48:13 +00:00
DarthArgus 058bcd9b3d check for gm in ConsoleCommandParserScript 2016-12-27 19:59:17 +00:00
DarthArgus 35e92f519f cleanup 2016-12-26 23:49:59 -06:00
DarthArgus 4ce4bd13d6 this works, incoming cleanup 2016-12-27 05:40:47 +00:00
DarthArgus 5ec6bb4d74 gosh oracle i hate you 2016-12-26 21:58:29 -06:00
DarthArgus c6c445b09b clean a bit 2016-12-26 21:53:46 -06:00
DarthArgus 892390b1b8 closer 2016-12-27 03:49:14 +00:00
DarthArgus 9904f2e271 cleanups 2016-12-27 02:38:50 +00:00
DarthArgus d0e630bf43 i mean...fix it 2016-12-27 00:45:49 +00:00
DarthArgus c47ba0e1bf fix build 2016-12-27 00:45:15 +00:00
DarthArgus 7a735068d5 sync with current tc and live code 2016-12-27 00:17:41 +00:00
DarthArgus 9fcb8a7029 cleanup 2016-12-26 15:04:50 -06:00
DarthArgus de998e1905 are ya kidding me? 2016-12-26 15:01:20 -06:00
DarthArgus 1ee12bcb3b yay syntax 2016-12-26 15:00:05 -06:00
DarthArgus 05d7edd012 further fixups 2016-12-26 14:58:28 -06:00
DarthArgus 4396ba1e33 typos, yay! 2016-12-26 14:57:02 -06:00
DarthArgus 9a2fa152f1 fixups 2016-12-26 14:55:08 -06:00
DarthArgus c99fee4802 in theory this will work 2016-12-26 14:50:53 -06:00
DarthArgus 39d41ee779 first try at nesting code, minus the actual insert 2016-12-26 14:31:06 -06:00
DarthArgus 530b2b470b add our mapping table 2016-12-26 13:56:45 -06:00
DarthArgus 36b35ea790 mitigate a seefo exploit; copy our profiled build cmakelists 2016-12-23 12:24:34 +00:00
DarthArgus bf1bc17c8e per cekis 2016-12-23 02:31:24 +00:00
DarthArgus a6ca356c00 turn off db cleanup 2016-12-22 23:05:16 +00:00
DarthArgus 2b6823ccb5 well this is closer to correct but i think we may need to ALWAYS use "myProcessId" instead of the one from db 2016-12-22 22:59:02 +00:00
DarthArgus e52db8de78 Merge branch 'morefun' into clang-profile-build 2016-12-21 21:17:32 +00:00
DarthArgus 5009441d4d maybe this is the culprit 2016-12-21 19:48:51 +00:00
DarthArgus f189edde22 return status on this function 2016-12-21 19:39:14 +00:00
DarthArgus fc1ecd364a sleep 100ms here instead of 500 2016-12-21 11:21:45 +00:00
DarthArgus 3376dd9ff3 you're running too damn fast! 2016-12-21 11:21:18 +00:00
DarthArgus 4f61e58604 revert the governor for jni 2016-12-21 11:10:37 +00:00
DarthArgus 957aef2366 we can build with newer compilers but _must_ use the gcc 5.x libs 2016-12-21 11:09:07 +00:00
DarthArgus c241284168 grrr, git, dammit 2016-12-21 08:02:13 +00:00
DarthArgus 125b27065c you're running too damn fast! 2016-12-21 07:59:16 +00:00
DarthArgus 5964a5fd17 (resync) Merge branch 'clang-profile-build' into testing 2016-12-21 07:25:54 +00:00
DarthArgus 4b40913c1d cleanups 2016-12-21 07:21:41 +00:00
DarthArgus abd34e0e99 just being anal 2016-12-21 04:21:24 +00:00
DarthArgus 41827b9d97 my mistake 2016-12-19 00:46:59 +00:00
DarthArgus ca7adf0471 cleanup 2016-12-19 00:18:49 +00:00
DarthArgus 34ee420ae0 Revert "fix race condition when persisting large numbers of items" 
This reverts commit 7b1f5a9991.
 2016-12-19 00:17:35 +00:00
DarthArgus ea7f5ef581 silence some more warnings in release mode 2016-12-18 04:47:37 +00:00