From 42d3e828b0134680bb2b9870a5b4edfe979828a2 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Wed, 18 Dec 2019 21:05:30 -0800 Subject: [PATCH] 4.1.0 ship files --- bin/itchio_push_all.bat | 31 ------------------------------- bin/itchio_push_win.bat | 25 +++++++++++++++++++++++++ custom/4coder_config.cpp | 2 +- ship_files/README.txt | 9 ++++++--- 4 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 bin/itchio_push_all.bat create mode 100644 bin/itchio_push_win.bat diff --git a/bin/itchio_push_all.bat b/bin/itchio_push_all.bat deleted file mode 100644 index a7a9833b..00000000 --- a/bin/itchio_push_all.bat +++ /dev/null @@ -1,31 +0,0 @@ -@echo off - -REM todo rewrite this as a build.cpp script - -IF "%3" == "" (echo need 3 parameters & GOTO END) - -SET fake=%1 -SET maj=%2 -SET min=%3 - -SET vr=%fake%.%maj%.%min% -SET fv=%fake%.%maj%.%min% - -SET flags=--fix-permissions --userversion=%vr% -SET dir=..\\current_dist_all_os - -butler push %flags% %dir%/4coder-alpha-%fv%-win-x64.zip 4coder/4coder:win-x64-alpha -butler push %flags% %dir%/4coder-alpha-%fv%-linux-x64.zip 4coder/4coder:linux-x64-alpha -butler push %flags% %dir%/4coder-alpha-%fv%-mac-x64.zip 4coder/4coder:osx-x64-alpha -butler push %flags% %dir%/4coder-alpha-%fv%-win-x86.zip 4coder/4coder:win-x86-alpha -butler push %flags% %dir%/4coder-alpha-%fv%-linux-x86.zip 4coder/4coder:linux-x86-alpha -butler push %flags% %dir%/4coder-alpha-%fv%-mac-x86.zip 4coder/4coder:osx-x86-alpha - -butler push %flags% %dir%/4coder-alpha-%fv%-super-win-x64.zip 4coder/4coder:win-x64-super -butler push %flags% %dir%/4coder-alpha-%fv%-super-linux-x64.zip 4coder/4coder:linux-x64-super -butler push %flags% %dir%/4coder-alpha-%fv%-super-mac-x64.zip 4coder/4coder:osx-x64-super -butler push %flags% %dir%/4coder-alpha-%fv%-super-win-x86.zip 4coder/4coder:win-x86-super -butler push %flags% %dir%/4coder-alpha-%fv%-super-linux-x86.zip 4coder/4coder:linux-x86-super -butler push %flags% %dir%/4coder-alpha-%fv%-super-mac-x86.zip 4coder/4coder:osx-x86-super - -:END \ No newline at end of file diff --git a/bin/itchio_push_win.bat b/bin/itchio_push_win.bat new file mode 100644 index 00000000..ebc7fa54 --- /dev/null +++ b/bin/itchio_push_win.bat @@ -0,0 +1,25 @@ +@echo off + +IF "%3" == "" (echo need 3 parameters & GOTO END) + +SET fake=%1 +SET maj=%2 +SET min=%3 + +SET vr=%fake%-%maj%-%min% +SET fv=%fake%-%maj%-%min% + +SET flags=--fix-permissions --userversion=%vr% + +pushd .. + +SET dir=%CD%\distributions + +butler push %flags% %dir%\demo_x64\4coder-%fv%-demo-win-x64.zip 4coder/4coder:win-x64-demo +butler push %flags% %dir%\demo_x86\4coder-%fv%-demo-win-x86.zip 4coder/4coder:win-x86-demo +butler push %flags% %dir%\super_x64\4coder-%fv%-super-win-x64.zip 4coder/4coder:win-x64 +butler push %flags% %dir%\super_x86\4coder-%fv%-super-win-x86.zip 4coder/4coder:win-x86 + +popd + +:END \ No newline at end of file diff --git a/custom/4coder_config.cpp b/custom/4coder_config.cpp index 7b1b2c40..bb283b16 100644 --- a/custom/4coder_config.cpp +++ b/custom/4coder_config.cpp @@ -1568,7 +1568,7 @@ load_config_and_apply(Application_Links *app, Arena *out_arena, Config_Data *con description.parameters.pt_size = config->default_font_size; } description.parameters.hinting = config->default_font_hinting || override_hinting; - + description.font.file_name = config->default_font_name; if (!modify_global_face_by_description(app, description)){ description.font.file_name = get_file_path_in_fonts_folder(scratch, config->default_font_name); diff --git a/ship_files/README.txt b/ship_files/README.txt index ebc9b70a..d01c6fe6 100644 --- a/ship_files/README.txt +++ b/ship_files/README.txt @@ -1,11 +1,14 @@ Thank you for contributing to the 4coder project! -To submit bug reports or to request particular features email: +To submit bug reports or to request particular features post them here: +https://github.com/4coder-editor/4coder/issues + +For questions email: editor@4coder.net -Watch the 4coder.handmade.network blog and @AllenWebster4th twitter for news about 4coder progress. +Watch the 4coder.handmade.network blog and @AllenWebster4th twitter for news about 4coder. For documentation, feature lists, and usage tutorial videos go to: -4coder.com +4coder.net