List of commits:
Subject Hash Author Date (UTC)
Attempt to fix JSON serializing in locales with commas beae8b63fb0deaaf0b66ef4f188df270120ebe1c mse 2021-11-17 11:19:18
Limit network settings to network-enabled builds 8ccef75176b9059a45afa9ea251c313be7b7cfe0 mse 2021-11-17 09:20:56
Add /fps console command 207ef051937c91f78dae3928ef004ee7aa7f2a7a mse 2021-11-16 21:33:32
Move userdata to game root directory f9bff9bb941b714e7c0987327804175d852b470b mse 2021-11-16 02:55:04
Add --savehere flag and bump version to v0.6.3 a59633113908903af57e4e1c62008fe154d4cbb7 mse 2021-11-16 02:12:25
Disable networking and remove dead code aaa8bd8300f89099bace4ee1de374d05dff2c089 mse 2021-11-15 05:17:06
Update gamecontrollerdb 828ce88dd2107d69b6332b9768f7c556473b8a24 mse 2021-11-14 00:29:26
Bump version to 0.6.2 baa2215230b5deed37b69f4075bd3b3385dbb913 mse 2021-11-14 00:08:13
Fix controller menu selection 3a1567ae279289d72058d6aa23d0c4eb147db2a8 mse 2021-11-13 23:00:12
Chinese translations for confec-select and name-your-confec 6c5c9d0fadb17066af82d459d1d46868af0e9faa mse 2021-11-13 20:58:26
Parse newlines in CSL notifications fc21ba1563a1c36ff20711c84b0dc3f3d7588646 mse 2021-11-13 05:12:11
Scriptable special items: GIVESPECIAL <id> <name> 256a2581e75dc3762b098f8cae3259899f8c4a94 mse 2021-11-13 03:24:02
Improved particles, darker nights, work on GIVESPECIAL e8e352e03fdffb8a8e57f94f99028bc1c6c03376 mse 2021-11-12 08:51:36
Fix caption padding bug a49cd2397d2e1b98679828303116db858d146a93 mse 2021-11-08 23:35:07
Disable is_regular_file for Boost support ebee78afad8b29f0332a4cf719c7c4d70e8c9ff8 mse 2021-11-08 22:41:42
Bump version to 0.6.1 9bdeecf9d39b75d12e44cb65bbb97a2e8277fcd4 mse 2021-11-08 21:34:25
Improve caption printing and start work on GIVESPECIAL ec51488e4fd5552ae6d22db1b6eedfef7c2541b7 mse 2021-11-08 20:29:59
Load current screen's images for CSL support 43ef06272048c164fc754a547a57859bdfb909db mse 2021-11-06 03:23:56
Fix Mac builds and bump version to v0.6.0 efcc6a0b4858af2abd027c8379d41ee1fe073620 mse 2021-11-04 23:40:55
Remove structured initializer for older compiler support 772a6b05b40cd5f7412a7736fe574319fe67289a mse 2021-11-04 17:54:41
Commit beae8b63fb0deaaf0b66ef4f188df270120ebe1c - Attempt to fix JSON serializing in locales with commas
Author: mse
Author date (UTC): 2021-11-17 11:19
Committer name: mse
Committer date (UTC): 2021-11-17 11:19
Parent(s): 8ccef75176b9059a45afa9ea251c313be7b7cfe0
Signing key:
Tree: 314c0411baf17ae3c99ee9d6cece45e72f9935c7
File Lines added Lines deleted
confec.cpp 1 0
include/fworld.h 14 0
File confec.cpp changed (mode: 100644) (index fc92b6d..0fd65f8)
... ... int main( int argc, char* argv[] ){
938 938 #else #else
939 939 // Determine language. Reset locale to deal with "unholy things" in GCC. // Determine language. Reset locale to deal with "unholy things" in GCC.
940 940 std::string loc = setlocale( LC_ALL, "" ); std::string loc = setlocale( LC_ALL, "" );
941 setlocale( LC_ALL, "C" );
941 942 if( ( loc.length() >= 2 && loc.substr( 0, 2 ) == "zh" ) if( ( loc.length() >= 2 && loc.substr( 0, 2 ) == "zh" )
942 943 || ( loc.length() >= 7 && loc.substr( 0, 7 ) == "Chinese" ) ){ || ( loc.length() >= 7 && loc.substr( 0, 7 ) == "Chinese" ) ){
943 944 language = "zh"; language = "zh";
File include/fworld.h changed (mode: 100755) (index 7b954f7..1264814)
14 14 #include <cmath> #include <cmath>
15 15
16 16 #include <algorithm> #include <algorithm>
17 //#include <charconv>
17 18 #include <functional> #include <functional>
18 19 #include <map> #include <map>
19 20 #include <string> #include <string>
 
... ... class World {
291 292 double mapFps; double mapFps;
292 293 void (*portalCallback)(std::string); void (*portalCallback)(std::string);
293 294 long double safeStold( const std::string &str ); long double safeStold( const std::string &str );
295 std::string safeDtos( double num );
294 296 fgl::Texture getTexture( std::string basePath, std::string imageName, bool filter ); fgl::Texture getTexture( std::string basePath, std::string imageName, bool filter );
295 297 bool tileBlocking( long long x, long long y, bool checkEntities = false ); bool tileBlocking( long long x, long long y, bool checkEntities = false );
296 298 void loadMap( std::string dataPath, std::string filePath ); void loadMap( std::string dataPath, std::string filePath );
 
... ... long double World::safeStold( const std::string &str ){
622 624 } }
623 625 } }
624 626
627 std::string safeDtos( double num ){
628 // TODO: C++17 only, and only in the ultra deluxe platinum edition.
629 /*
630 char buf[64];
631 char *last = buf + sizeof(buf);
632 auto result = std::to_chars( (char*)buf, (char*)last, (double)num );
633 if( result.ptr == last ) return "0.0"; // Error.
634 return std::string( buf, result.ptr - buf );
635 */
636 return std::to_string( num ); // Locale-dependent.
637 }
638
625 639 fgl::Texture World::getTexture( std::string basePath, std::string imageName, bool filter ){ fgl::Texture World::getTexture( std::string basePath, std::string imageName, bool filter ){
626 640 if( imageName.length() < 1 ){ if( imageName.length() < 1 ){
627 641 return fgl::newTexture; return fgl::newTexture;
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/ConfectionerEngine

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main