From c7c70216990a50541891a9a8fd38e3ffbd27c968 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 12 Dec 2017 12:08:11 -0500 Subject: [PATCH] Modify TODO, change 'about' text --- TODO.md | 4 +++- android/AndroidManifest.xml | 2 +- android/build.gradle | 2 +- .../io/anuke/mindustry/AndroidLauncher.java | 1 - core/assets/maps/caves.png | Bin 5397 -> 5411 bytes core/src/io/anuke/mindustry/Vars.java | 7 ++++++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/TODO.md b/TODO.md index 66d6ca0aeb..c80c593414 100644 --- a/TODO.md +++ b/TODO.md @@ -8,7 +8,7 @@ _Keep in mind that this is just a basic outline of planned features, and will be - [DONE] Make generation frame independent - [DONE/MOVED] Investigate issue #5 (enemies stuck in blocks) - looks like it's caused by map loading lag, needs to be fixed with a slightly different physics system - [DONE] Faster mech movement, possibly with a "boost" key -- Balance enemy difficulty +- [DONE] Balance enemy difficulty ### 3.x Planned - New save system: toggleable autosave, named slots, less clunky save UI @@ -19,6 +19,8 @@ _Keep in mind that this is just a basic outline of planned features, and will be - Underground conduits - Minimap - More indicators for when the core is damaged and/or under attack +- Fix bugs with junction not accepting blocks(low FPS) +- Fix bugs with tunnel merging and/or removing items (low FPS) ### 4.0 Planned diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index ddea4614af..021d22f2ca 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/android/build.gradle b/android/build.gradle index 9987876659..a2073df378 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -33,7 +33,7 @@ android { } defaultConfig { applicationId "io.anuke.mindustry" - minSdkVersion 11 + minSdkVersion 9 targetSdkVersion 25 jackOptions { diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 718805af04..42f9a71717 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -25,7 +25,6 @@ public class AndroidLauncher extends AndroidApplication{ config.useImmersiveMode = true; Mindustry.formatter = new Formatter(){ - @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm"); @Override diff --git a/core/assets/maps/caves.png b/core/assets/maps/caves.png index 1f8e2f66d80db15906494ad4f04721f8bcb4080d..1fc4865796976d1d98c6e39f5f84731ad723a023 100644 GIT binary patch delta 4775 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 delta 4790 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