Commit Graph
1268 Commits
Author SHA1 Message Date
DarthArgus cf82ce9dc5 fixups 2018-06-03 10:37:47 +00:00
DarthArgus f92da53e65 Merge branch 'testing' of bitbucket.org:stellabellumswg/src into testing 2018-06-03 05:27:51 -05:00
DarthArgus 18671f57e1 phew 2018-06-03 05:27:43 -05:00
DarthArgus 7d9b2741f6 bah - Revert "don't even load sharedebug if we're in prod mode"
This reverts commit 695d1f77b5.
2018-06-03 09:52:59 +00:00
DarthArgus 92c0b29559 autoformat 2018-06-03 03:13:58 -05:00
DarthArgus 619b79c217 work in progress but this should be faster 2018-06-03 08:08:11 +00:00
DarthArgus 695d1f77b5 don't even load sharedebug if we're in prod mode 2018-06-03 03:54:00 +00:00
DarthArgus 33cb10bab4 Merge branch 'sbtc' into testing 2018-05-17 18:04:52 +00:00
DarthArgus 1fcbbaeb40 Revert "switch to int64 for the StationId typedef, and use the StationId typedef everywhere. Note that the Archive.h in this commit really needs to use a centralized Types.h or FoundationTypes.h file, as do many others...in this case I just typedefed at the top"
This reverts commit 8fb01069e1.
2018-05-17 17:55:22 +00:00
DarthArgus fc52ba532a Revert "use larger sized ints so that oracle doesn't crap the bed"
This reverts commit ca105492e7.
2018-05-17 17:53:30 +00:00
DarthArgus 3167f81fcd Revert "this should make things display properly again"
This reverts commit 9dffede072.
2018-05-17 17:53:19 +00:00
DarthArgus b3149429f1 Revert "forgot to switch to the 64 bit int map func"
This reverts commit ea64809fbb.
2018-05-17 17:53:12 +00:00
DarthArgus 678772a20f add note 2018-05-17 17:40:07 +00:00
DarthArgus 199ab96a9b remove the 64 bit bindables, and move that workaround to a sbtc branch because that server's data is screwed up 2018-05-17 17:38:15 +00:00
DarthArgus 59f2c9d7da Revert "fixes display and some things; probably will have to do some hackery to get classic hashed station ids working"
This reverts commit aef53f66bd.
2018-05-17 17:25:29 +00:00
DarthArgus 6f00618c34 Revert "more work toward using int64 for station id"
This reverts commit 2e101af87d.
2018-05-17 17:24:30 +00:00
DarthArgus ce95df149f Revert "more conversions"
This reverts commit dd550b81db.
2018-05-17 17:23:55 +00:00
DarthArgus fee6bedc39 Revert "switch to int64 for the StationId typedef, and use the StationId typedef everywhere. Note that the Archive.h in this commit really needs to use a centralized Types.h or FoundationTypes.h file, as do many others...in this case I just typedefed at the top"
This reverts commit 8fb01069e1.
2018-05-17 17:22:05 +00:00
DarthArgus dd550b81db more conversions 2018-05-17 01:58:59 +00:00
DarthArgus 2e101af87d more work toward using int64 for station id 2018-05-17 00:44:36 +00:00
DarthArgus aef53f66bd fixes display and some things; probably will have to do some hackery to get classic hashed station ids working 2018-05-16 07:24:16 +00:00
DarthArgus 29cfee7922 Revert "revert to using 32 bit ints for station id's because...it breaks legacy ones if we don't"
This reverts commit 1b49c7e742.
2018-05-16 06:22:56 +00:00
DarthArgus 8cb5a17cd9 miff doesn't compile properly in release or minsizerel modes under clang; for now we'll work around it between this and the build script
properly bind these

Revert "properly bind these"

This reverts commit 367f0e2d9aa1fcbb9637797965dc254f8b556c69.
2018-05-16 05:40:04 +00:00
DarthArgus 1b49c7e742 revert to using 32 bit ints for station id's because...it breaks legacy ones if we don't 2018-05-16 05:40:04 +00:00
DarthArgus 4636ed0b65 enable 17 features 2018-05-16 05:40:04 +00:00
DarthArgus ea64809fbb forgot to switch to the 64 bit int map func 2018-05-16 05:40:04 +00:00
DarthArgus 9dffede072 this should make things display properly again 2018-05-16 05:40:04 +00:00
DarthArgus ca105492e7 use larger sized ints so that oracle doesn't crap the bed 2018-05-16 05:40:04 +00:00
DarthArgus 2fbe8ae06a Merge branch 'master' into testing 2018-05-11 04:25:29 +00:00
DarthArgus bea26d2dec all that and i forget to change it here 2018-05-11 04:25:14 +00:00
DarthArgus 631a48db28 Merge branch 'master' into testing 2018-05-11 04:18:46 +00:00
DarthArgus 8fb01069e1 switch to int64 for the StationId typedef, and use the StationId typedef everywhere. Note that the Archive.h in this commit really needs to use a centralized Types.h or FoundationTypes.h file, as do many others...in this case I just typedefed at the top 2018-05-11 04:16:07 +00:00
DarthArgus 9315744648 per @cekis, truncate so we don't get 40 char long timestamp floats 2018-05-10 20:15:13 +00:00
DarthArgus 494f64c4e6 simplify our cflags 2018-05-09 17:00:28 +00:00
DarthArgus 64514b40cb add oracle 12.2 support 2018-05-09 05:59:31 +00:00
DarthArgus 3350ecc52c Merge branch 'master' of bitbucket.org:stellabellumswg/src 2018-05-05 22:18:55 +00:00
CekisSWGandDarthArgus 8d43ff6b90 Fixed issue with some creatures (i.e. holopets) not being allowed in buildings. 2018-05-05 22:18:01 +00:00
CekisSWGandDarthArgus df8124ce52 Fixed issue with some creatures (i.e. holopets) not being allowed in buildings. 2018-05-05 22:17:21 +00:00
CekisSWG 8f981ad2e2 Merge branch 'master' of https://bitbucket.org/stellabellumswg/src 2018-05-05 18:08:34 +01:00
CekisSWG 447efa287b Fixed issue with some creatures (i.e. holopets) not being allowed in buildings. 2018-05-05 18:08:22 +01:00
DarthArgus 9ea17210eb everything seems to run without issue now 2018-05-05 04:26:41 +00:00
DarthArgus 340ea95b84 let's not redundantly call this...ok, SOE? 2018-05-04 04:01:30 +00:00
DarthArgus 4a6902179d defang webAPIHeartbeat, which is off by default, and remove the vxEncrypt stuff 2018-05-03 18:04:39 +00:00
DarthArgus 57de937e61 use ld.gold for now 2018-05-03 06:22:32 +00:00
DarthArgus 7dd710e713 cleanup 2018-05-02 22:09:38 +00:00
DarthArgus c4a183a3c2 fixup 2018-05-02 21:38:17 +00:00
DarthArgus 155cf45c9b Revert "Revert "don't build with the heartbeat turned on""
This reverts commit 1d3906364a.
2018-05-02 21:36:49 +00:00
DarthArgus 1d3906364a Revert "don't build with the heartbeat turned on"
This reverts commit cdf0922996.
2018-05-02 21:35:53 +00:00
DarthArgus cdf0922996 don't build with the heartbeat turned on 2018-05-02 21:27:46 +00:00
DarthArgus 378493a7c3 seems relax may not be supported by lld...may be to do some trickery to figure out the ld.gold vs lld situation 2018-05-02 18:09:06 +00:00