From 7a02019b7c4cb9e2c994fda109c94467fadb5082 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 17 Nov 2019 20:15:10 +0200 Subject: [PATCH] Resolved #1340 Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet), don't support non-power-of-two texture sizes - kudos @yuroller! --- .../com/unciv/app/desktop/DesktopLauncher.java | 17 ++++++++++------- docs/Credits.md | 4 +++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.java b/desktop/src/com/unciv/app/desktop/DesktopLauncher.java index a06f054f15..1704f8cf90 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.java +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.java @@ -11,17 +11,20 @@ import java.io.File; class DesktopLauncher { public static void main (String[] arg) { - if(new File("../Images").exists()) { // So we don't run this from within a fat JAR + if (new File("../Images").exists()) { // So we don't run this from within a fat JAR TexturePacker.Settings settings = new TexturePacker.Settings(); - settings.maxWidth = 2500; - settings.maxHeight = 2500; - settings.combineSubdirectories=true; - settings.pot=false; - settings.fast=true; + // Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet), + // don't support non-power-of-two texture sizes - kudos @yuroller! + // https://github.com/yairm210/UnCiv/issues/1340 + settings.maxWidth = 2048; + settings.maxHeight = 2048; + settings.combineSubdirectories = true; + settings.pot = true; + settings.fast = true; // This is so they don't look all pixelated settings.filterMag = Texture.TextureFilter.MipMapLinearLinear; - settings.filterMin = Texture.TextureFilter.MipMapLinearLinear; + settings.filterMin = Texture.TextureFilter.MipMapLinearLinear; TexturePacker.process(settings, "../Images", ".", "game"); } diff --git a/docs/Credits.md b/docs/Credits.md index 70ce78ddf6..3791d866a9 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -3,9 +3,11 @@ Flag Icons made by [Freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](https://www.flaticon.com) and licensed by Creative Commons 3.0 -Base tile icons for the "Fantasy Hex" tileset belong to CuddlyClover @ https://cuddlyclover.itch.io/fantasy-hex-tiles with a few additions by me +Base tile icons for the "Fantasy Hex" tileset belong to CuddlyClover @ https://cuddlyclover.itch.io/fantasy-hex-tiles with a few additions by me Trees for the jungle tiles in the "Fantasy Hex" are extracted from [Desert Strike for the Amiga](http://eab.abime.net/showthread.php?t=67078&styleid=4) + +Almost all the improvements and units made by The Bucketeer on Discord Tile icons for the "ThorfMaps tileset belong to Thorfinn Tait and are licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. Based on work at www.thorfmaps.com.