diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 08ad3a55e6..bba27b9e8f 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="2" + android:versionName="1.01" > diff --git a/build.gradle b/build.gradle index 62fce7581f..e99baef431 100644 --- a/build.gradle +++ b/build.gradle @@ -77,8 +77,8 @@ project(":core") { apply plugin: "java" dependencies { - //compile fileTree(dir: '../core/lib', include: '*.jar') - compile 'com.github.Anuken:ucore:b58e4bd' + compile fileTree(dir: '../core/lib', include: '*.jar') + //compile 'com.github.Anuken:ucore:b58e4bd' compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-ai:1.8.1" } diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index 9b4cb86d33..e891ae3ee8 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -43,6 +43,7 @@ public class Control extends RendererModule{ Sounds.load("shoot.wav", "place.wav", "explosion.wav", "enemyshoot.wav", "corexplode.wav", "break.wav", "spawn.wav", "flame.wav", "die.wav", "respawn.wav", "purchase.wav", "flame2.wav"); + Musics.load("1.mp3", "2.mp3", "3.mp3"); Generator.loadMaps(); diff --git a/html/build.gradle b/html/build.gradle index aa1759083c..49138f23a7 100644 --- a/html/build.gradle +++ b/html/build.gradle @@ -3,7 +3,7 @@ apply plugin: "jetty" gwt { gwtVersion='2.8.0' // Should match the gwt version used for building the gwt backend - maxHeapSize="1G" // Default 256m is not enough for gwt compiler. GWT is HUNGRY + maxHeapSize="2G" // Default 256m is not enough for gwt compiler. GWT is HUNGRY minHeapSize="1G" src = files(file("src/")) // Needs to be in front of "modules" below. @@ -13,6 +13,7 @@ gwt { compiler { strict = true; + //enableClosureCompiler = true; disableCastChecking = true; } } diff --git a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml index 5fa5ec9f27..4c353cf771 100644 --- a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml +++ b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml @@ -9,5 +9,5 @@ - +