diff --git a/build/android/Start.sh b/build/android/Start.sh index 10f5465d..5e673326 100755 --- a/build/android/Start.sh +++ b/build/android/Start.sh @@ -16,7 +16,7 @@ for dir in builtin textures client; do done mkdir -p $DEST/fonts -cp ../../fonts/Retron2000.ttf $DEST/fonts/ # no PNG fonts because freetype +cp ../../fonts/MultiCraftFont.ttf $DEST/fonts/ # no PNG fonts because freetype cp -r native/deps/Android/Irrlicht/shaders $DEST/client/shaders/Irrlicht @@ -36,8 +36,7 @@ done popd find $DEST -type d -name '.git' -print0 | xargs -0 -- rm -r -find $DEST -type f -name '.git*' -delete -find $DEST -type f -name '.DS_Store' -delete +find $DEST -type f -name '.*' -delete # remove broken languages for broken_lang in ja ko he; do diff --git a/build/iOS/assets.sh b/build/iOS/assets.sh index b05ae92b..356ba48b 100755 --- a/build/iOS/assets.sh +++ b/build/iOS/assets.sh @@ -15,7 +15,7 @@ done cp -r deps/irrlicht/shaders $DEST/client/shaders/Irrlicht mkdir -p $DEST/fonts -cp ../../fonts/Retron2000.ttf $DEST/fonts/ # no PNG fonts because freetype +cp ../../fonts/MultiCraftFont.ttf $DEST/fonts/ # no PNG fonts because freetype mkdir -p $DEST/games cp -r ../../games/default $DEST/games/default pushd ../../po @@ -26,27 +26,20 @@ for lang in *; do pushd $lang for fn in *.po; do # brew install gettext - /usr/local/Cellar/gettext/*/bin/msgfmt -o $mopath/${fn/.po/.mo} $fn + msgfmt -o $mopath/${fn/.po/.mo} $fn done popd done popd find $DEST -type d -name '.git' -print0 | xargs -0 -- rm -r -find $DEST -type f -name '.git*' -delete -find $DEST -type f -name '.DS_Store' -delete +find $DEST -type f -name '.*' -delete # remove broken languages for broken_lang in ja ko he; do find $DEST -type d -name $broken_lang -print0 | xargs -0 -- rm -r done -# remove unnecessary mods -#MODS=$DEST/games/default/files -#for mods in MOD_NAMES; do -# find $DEST/games/default/files -type d -name $mods -print0 | xargs -0 -- rm -r -#done - # remove inaccessible text files for name in settingtypes LICENSE license README COPYING; do find $DEST -type f -name $name".txt" -exec rm -f {} \; diff --git a/doc/Font Licenses/1001fonts-retron2000-eula.txt b/doc/Font Licenses/1001fonts-retron2000-eula.txt deleted file mode 100644 index 65bdd15d..00000000 --- a/doc/Font Licenses/1001fonts-retron2000-eula.txt +++ /dev/null @@ -1,37 +0,0 @@ -1001Fonts Free For Commercial Use License (FFC) - -Preamble -In this license, 'Retron2000' refers to the given .zip file, which may contain one or numerous fonts. These fonts can be of any type (.ttf, .otf, ...) and together they form a 'font family' or in short a 'typeface'. - -1. Copyright -Retron2000 is the intellectual property of its respective author, provided it is original, and is protected by copyright laws in many parts of the world. - -2. Usage -Retron2000 may be downloaded and used free of charge for both personal and commercial use, as long as the usage is not racist or illegal. Personal use refers to all usage that does not generate financial income in a business manner, for instance: - - - personal scrapbooking for yourself - - recreational websites and blogs for friends and family - - prints such as flyers, posters, t-shirts for churches, charities, and non-profit organizations - -Commercial use refers to usage in a business environment, including: - - - business cards, logos, advertising, websites, mobile apps for companies - - t-shirts, books, apparel that will be sold for money - - flyers, posters for events that charge admission - - freelance graphic design work - - anything that will generate direct or indirect income - -3. Modification -Retron2000 may not be modified, altered, adapted or built upon without written permission by its respective author. This pertains all files within the downloadable font zip-file. - -4. Conversion -Retron2000 may be converted to other formats such as WOFF, SVG or EOT webfonts, as long as the font is not modified in any other way, such as changing names or altering individual glyphs. - -5. Distribution -While Retron2000 may freely be copied and passed along to other individuals for private use as its original downloadable zip-file, it may not be sold or published without written permission by its respective author. - -6. Embedding -Retron2000 may be embedded into an application such as a web- or mobile app, independant of the number of the application users, as long as the application does not distribute Retron2000, such as offering it as a download. - -7. Disclaimer -Retron2000 is offered 'as is' without any warranty. 1001fonts.com and the respective author of Retron2000 shall not be liable for any damage derived from using this typeface. By using Retron2000 you agree to the terms of this license. diff --git a/doc/Other License.md b/doc/Other License.md index 79950f73..003657c1 100644 --- a/doc/Other License.md +++ b/doc/Other License.md @@ -289,9 +289,3 @@ DroidSansFallBack: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -Retron2000: - - 1001Fonts Free For Commercial Use License (FFC) - - Full copy of license you can find in source code: doc/Font Licenses/1001fonts-retron2000-eula.txt diff --git a/fonts/MultiCraftFont.ttf b/fonts/MultiCraftFont.ttf new file mode 100644 index 00000000..e9ab4891 Binary files /dev/null and b/fonts/MultiCraftFont.ttf differ diff --git a/fonts/Retron2000.ttf b/fonts/Retron2000.ttf deleted file mode 100644 index f30c7e1b..00000000 Binary files a/fonts/Retron2000.ttf and /dev/null differ diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6fc12f63..a6d21e8d 100755 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -241,7 +241,7 @@ void set_default_settings(Settings *settings) { #if USE_FREETYPE settings->setDefault("freetype", "true"); - settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Retron2000.ttf")); + settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "MultiCraftFont.ttf")); settings->setDefault("font_shadow", "1"); settings->setDefault("font_shadow_alpha", "127"); settings->setDefault("mono_font_path", @@ -567,11 +567,13 @@ void set_default_settings(Settings *settings) { settings->setDefault("hud_scaling", "0.55"); settings->setDefault("mouse_sensitivity", "0.33"); settings->setDefault("font_size", font_small); + settings->setDefault("fallback_font_size", font_small); } else if SDVersion4and7Inch { // 4.7" iPhone settings->setDefault("hud_scaling", "0.6"); settings->setDefault("mouse_sensitivity", "0.27"); settings->setDefault("font_size", font_small); + settings->setDefault("fallback_font_size", font_small); } else if SDVersion5and5Inch { // 5.5" iPhone Plus settings->setDefault("hud_scaling", "0.65");