Fixed bug with conveyor belt rotation not being saved
7
.gitignore
vendored
@@ -1,9 +1,14 @@
|
|||||||
|
##Packr, build stuff
|
||||||
|
|
||||||
|
/deploy/
|
||||||
|
/desktop/packr-out/
|
||||||
|
/desktop/packr-export/
|
||||||
|
|
||||||
## Java
|
## Java
|
||||||
|
|
||||||
*.class
|
*.class
|
||||||
*.war
|
*.war
|
||||||
*.ear
|
*.ear
|
||||||
*.gif
|
|
||||||
hs_err_pid*
|
hs_err_pid*
|
||||||
|
|
||||||
## Robovm
|
## Robovm
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="io.anuke.mindustry"
|
package="io.anuke.mindustry"
|
||||||
android:versionCode="3"
|
android:versionCode="4"
|
||||||
android:versionName="1.02" >
|
android:versionName="1.1" >
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
|
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 210 B |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 12 KiB |
@@ -1,9 +1,14 @@
|
|||||||
package io.anuke.mindustry;
|
package io.anuke.mindustry;
|
||||||
|
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
import com.badlogic.gdx.backends.android.AndroidApplication;
|
import com.badlogic.gdx.backends.android.AndroidApplication;
|
||||||
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
|
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import io.anuke.mindustry.io.SaveIO;
|
||||||
|
import io.anuke.mindustry.io.SaveIO.FormatProvider;
|
||||||
|
|
||||||
public class AndroidLauncher extends AndroidApplication {
|
public class AndroidLauncher extends AndroidApplication {
|
||||||
@Override
|
@Override
|
||||||
@@ -11,6 +16,15 @@ public class AndroidLauncher extends AndroidApplication {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
|
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
|
||||||
config.useImmersiveMode = true;
|
config.useImmersiveMode = true;
|
||||||
|
|
||||||
|
SaveIO.setFormatProvider(new FormatProvider(){
|
||||||
|
SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss");
|
||||||
|
|
||||||
|
public String format(Date date){
|
||||||
|
return format.format(date);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
initialize(new Mindustry(), config);
|
initialize(new Mindustry(), config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ buildscript {
|
|||||||
dependencies {
|
dependencies {
|
||||||
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
||||||
classpath 'com.android.tools.build:gradle:2.2.0'
|
classpath 'com.android.tools.build:gradle:2.2.0'
|
||||||
|
classpath 'org.akhikhl.gretty:gretty:+'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,8 +78,7 @@ project(":core") {
|
|||||||
apply plugin: "java"
|
apply plugin: "java"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
//compile fileTree(dir: '../core/lib', include: '*.jar')
|
compile fileTree(dir: '../core/lib', include: '*.jar')
|
||||||
//compile 'com.github.Anuken:ucore:88b945b'
|
|
||||||
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
|
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
|
||||||
compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
|
compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
core/assets-raw/sprites/block.png
Normal file
|
After Width: | Height: | Size: 182 B |
BIN
core/assets-raw/sprites/bossmech.png
Normal file
|
After Width: | Height: | Size: 346 B |
BIN
core/assets-raw/sprites/bullet.png
Normal file
|
After Width: | Height: | Size: 189 B |
BIN
core/assets-raw/sprites/circle.png
Normal file
|
After Width: | Height: | Size: 235 B |
BIN
core/assets-raw/sprites/coal1.png
Normal file
|
After Width: | Height: | Size: 258 B |
BIN
core/assets-raw/sprites/coal2.png
Normal file
|
After Width: | Height: | Size: 237 B |
BIN
core/assets-raw/sprites/coal3.png
Normal file
|
After Width: | Height: | Size: 256 B |
BIN
core/assets-raw/sprites/coaldrill.png
Normal file
|
After Width: | Height: | Size: 253 B |
BIN
core/assets-raw/sprites/conveyor.png
Normal file
|
After Width: | Height: | Size: 195 B |
BIN
core/assets-raw/sprites/conveyormove.png
Normal file
|
After Width: | Height: | Size: 195 B |
BIN
core/assets-raw/sprites/core.png
Normal file
|
After Width: | Height: | Size: 285 B |
BIN
core/assets-raw/sprites/deepwater.png
Normal file
|
After Width: | Height: | Size: 156 B |
BIN
core/assets-raw/sprites/dirt1.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
core/assets-raw/sprites/dirt2.png
Normal file
|
After Width: | Height: | Size: 197 B |
BIN
core/assets-raw/sprites/dirt3.png
Normal file
|
After Width: | Height: | Size: 196 B |
BIN
core/assets-raw/sprites/dirtblock.png
Normal file
|
After Width: | Height: | Size: 229 B |
BIN
core/assets-raw/sprites/dirtedge.png
Normal file
|
After Width: | Height: | Size: 253 B |
BIN
core/assets-raw/sprites/doubleturret.png
Normal file
|
After Width: | Height: | Size: 308 B |
BIN
core/assets-raw/sprites/drill.png
Normal file
|
After Width: | Height: | Size: 240 B |
BIN
core/assets-raw/sprites/fastmech.png
Normal file
|
After Width: | Height: | Size: 305 B |
BIN
core/assets-raw/sprites/firemech.png
Normal file
|
After Width: | Height: | Size: 368 B |
BIN
core/assets-raw/sprites/flameturret.png
Normal file
|
After Width: | Height: | Size: 372 B |
BIN
core/assets-raw/sprites/furnace.png
Normal file
|
After Width: | Height: | Size: 246 B |
BIN
core/assets-raw/sprites/grass1.png
Normal file
|
After Width: | Height: | Size: 217 B |
BIN
core/assets-raw/sprites/grass2.png
Normal file
|
After Width: | Height: | Size: 206 B |
BIN
core/assets-raw/sprites/grass3.png
Normal file
|
After Width: | Height: | Size: 206 B |
BIN
core/assets-raw/sprites/grassblock.png
Normal file
|
After Width: | Height: | Size: 237 B |
BIN
core/assets-raw/sprites/grassblock2.png
Normal file
|
After Width: | Height: | Size: 248 B |
BIN
core/assets-raw/sprites/grassedge.png
Normal file
|
After Width: | Height: | Size: 245 B |
BIN
core/assets-raw/sprites/icon-coal.png
Normal file
|
After Width: | Height: | Size: 219 B |
BIN
core/assets-raw/sprites/icon-iron.png
Normal file
|
After Width: | Height: | Size: 240 B |
BIN
core/assets-raw/sprites/icon-steel.png
Normal file
|
After Width: | Height: | Size: 277 B |
BIN
core/assets-raw/sprites/icon-stone.png
Normal file
|
After Width: | Height: | Size: 207 B |
BIN
core/assets-raw/sprites/iron1.png
Normal file
|
After Width: | Height: | Size: 256 B |
BIN
core/assets-raw/sprites/iron2.png
Normal file
|
After Width: | Height: | Size: 252 B |
BIN
core/assets-raw/sprites/iron3.png
Normal file
|
After Width: | Height: | Size: 257 B |
BIN
core/assets-raw/sprites/irondrill.png
Normal file
|
After Width: | Height: | Size: 256 B |
BIN
core/assets-raw/sprites/ironwall.png
Normal file
|
After Width: | Height: | Size: 194 B |
BIN
core/assets-raw/sprites/junction.png
Normal file
|
After Width: | Height: | Size: 257 B |
BIN
core/assets-raw/sprites/laser.png
Normal file
|
After Width: | Height: | Size: 141 B |
BIN
core/assets-raw/sprites/laserend.png
Normal file
|
After Width: | Height: | Size: 273 B |
BIN
core/assets-raw/sprites/machineturret.png
Normal file
|
After Width: | Height: | Size: 341 B |
BIN
core/assets-raw/sprites/mech1.png
Normal file
|
After Width: | Height: | Size: 275 B |
BIN
core/assets-raw/sprites/megarepairturret.png
Normal file
|
After Width: | Height: | Size: 337 B |
BIN
core/assets-raw/sprites/mossblock.png
Normal file
|
After Width: | Height: | Size: 250 B |
BIN
core/assets-raw/sprites/mossstone.png
Normal file
|
After Width: | Height: | Size: 250 B |
4
core/assets-raw/sprites/pack.json
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
duplicatePadding: true,
|
||||||
|
combineSubdirectories: true
|
||||||
|
}
|
||||||
BIN
core/assets-raw/sprites/player.png
Normal file
|
After Width: | Height: | Size: 265 B |
BIN
core/assets-raw/sprites/repairturret.png
Normal file
|
After Width: | Height: | Size: 343 B |
BIN
core/assets-raw/sprites/rock.png
Normal file
|
After Width: | Height: | Size: 218 B |
BIN
core/assets-raw/sprites/rock2.png
Normal file
|
After Width: | Height: | Size: 214 B |
BIN
core/assets-raw/sprites/rock2shadow.png
Normal file
|
After Width: | Height: | Size: 236 B |
BIN
core/assets-raw/sprites/rockshadow.png
Normal file
|
After Width: | Height: | Size: 235 B |
BIN
core/assets-raw/sprites/router.png
Normal file
|
After Width: | Height: | Size: 226 B |
BIN
core/assets-raw/sprites/shadow.png
Normal file
|
After Width: | Height: | Size: 170 B |
BIN
core/assets-raw/sprites/shotgunturret.png
Normal file
|
After Width: | Height: | Size: 325 B |
BIN
core/assets-raw/sprites/shrub.png
Normal file
|
After Width: | Height: | Size: 274 B |
BIN
core/assets-raw/sprites/shrubshadow.png
Normal file
|
After Width: | Height: | Size: 278 B |
BIN
core/assets-raw/sprites/smelter.png
Normal file
|
After Width: | Height: | Size: 246 B |
BIN
core/assets-raw/sprites/sniperturret.png
Normal file
|
After Width: | Height: | Size: 374 B |
BIN
core/assets-raw/sprites/steelconveyor.png
Normal file
|
After Width: | Height: | Size: 195 B |
BIN
core/assets-raw/sprites/steelconveyormove.png
Normal file
|
After Width: | Height: | Size: 195 B |
BIN
core/assets-raw/sprites/steelwall.png
Normal file
|
After Width: | Height: | Size: 224 B |
BIN
core/assets-raw/sprites/stone.png
Normal file
|
After Width: | Height: | Size: 225 B |
BIN
core/assets-raw/sprites/stone1.png
Normal file
|
After Width: | Height: | Size: 189 B |
BIN
core/assets-raw/sprites/stone2.png
Normal file
|
After Width: | Height: | Size: 189 B |
BIN
core/assets-raw/sprites/stone3.png
Normal file
|
After Width: | Height: | Size: 186 B |
BIN
core/assets-raw/sprites/stoneblock.png
Normal file
|
After Width: | Height: | Size: 208 B |
BIN
core/assets-raw/sprites/stoneblock2.png
Normal file
|
After Width: | Height: | Size: 203 B |
BIN
core/assets-raw/sprites/stoneblock3.png
Normal file
|
After Width: | Height: | Size: 204 B |
BIN
core/assets-raw/sprites/stonedrill.png
Normal file
|
After Width: | Height: | Size: 246 B |
BIN
core/assets-raw/sprites/stoneedge.png
Normal file
|
After Width: | Height: | Size: 250 B |
BIN
core/assets-raw/sprites/stonewall.png
Normal file
|
After Width: | Height: | Size: 182 B |
BIN
core/assets-raw/sprites/turret.png
Normal file
|
After Width: | Height: | Size: 317 B |
BIN
core/assets-raw/sprites/water.png
Normal file
|
After Width: | Height: | Size: 156 B |
BIN
core/assets-raw/sprites/wateredge.png
Normal file
|
After Width: | Height: | Size: 222 B |
BIN
core/assets-raw/sprites/weapon-blaster.png
Normal file
|
After Width: | Height: | Size: 274 B |
BIN
core/assets-raw/sprites/weapon-flamethrower.png
Normal file
|
After Width: | Height: | Size: 301 B |
BIN
core/assets-raw/sprites/weapon-multigun.png
Normal file
|
After Width: | Height: | Size: 296 B |
BIN
core/assets-raw/sprites/weapon-trishot.png
Normal file
|
After Width: | Height: | Size: 281 B |
|
Before Width: | Height: | Size: 85 B After Width: | Height: | Size: 85 B |
|
Before Width: | Height: | Size: 995 B After Width: | Height: | Size: 995 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 86 B After Width: | Height: | Size: 86 B |
|
Before Width: | Height: | Size: 87 B After Width: | Height: | Size: 87 B |
|
Before Width: | Height: | Size: 176 B After Width: | Height: | Size: 176 B |
|
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 178 B |
|
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 124 B After Width: | Height: | Size: 124 B |
|
Before Width: | Height: | Size: 125 B After Width: | Height: | Size: 125 B |
|
Before Width: | Height: | Size: 127 B After Width: | Height: | Size: 127 B |
|
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 212 B |
|
Before Width: | Height: | Size: 200 B After Width: | Height: | Size: 200 B |