diff --git a/build.gradle b/build.gradle index 031014ecda..0e154f3b2d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,6 @@ buildscript { dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' classpath 'com.android.tools.build:gradle:3.0.1' - //classpath 'org.akhikhl.gretty:gretty:+' } } @@ -86,6 +85,9 @@ project(":core") { }else{ compile "com.github.anuken:ucore:$uCoreVersion" } + if(new File('../GDXGifRecorder').exists()) { + compile project(":GDXGifRecorder") + } compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-ai:$aiVersion" } diff --git a/core/src/io/anuke/mindustry/ai/Pathfind.java b/core/src/io/anuke/mindustry/ai/Pathfind.java index c35a2e03d1..63d64d9250 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfind.java +++ b/core/src/io/anuke/mindustry/ai/Pathfind.java @@ -15,7 +15,7 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Tmp; public class Pathfind{ - private static final long ms = 1000000 * 3; + private static final long ms = 1000000 * 5; MHueristic heuristic = new MHueristic(); PassTileGraph graph = new PassTileGraph(); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 9063aed9a6..724079300d 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -324,7 +324,7 @@ public class Renderer extends RendererModule{ void drawOverlay(){ //draw tutorial placement point - if(Vars.control.tutorial.showBlock()){ + if(Vars.world.getMap().name.equals("tutorial") && Vars.control.tutorial.showBlock()){ int x = control.core.x + Vars.control.tutorial.getPlacePoint().x; int y = control.core.y + Vars.control.tutorial.getPlacePoint().y; int rot = Vars.control.tutorial.getPlaceRotation(); diff --git a/settings.gradle b/settings.gradle index 8c1c9cc895..344ba1d489 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,3 +4,8 @@ if (new File(settingsDir, '../uCore').exists()) { include ':uCore' project(':uCore').projectDir = new File(settingsDir, '../uCore') } + +if (new File(settingsDir, '../GDXGifRecorder').exists()) { + include ':GDXGifRecorder' + project(':GDXGifRecorder').projectDir = new File(settingsDir, '../GDXGifRecorder') +} diff --git a/upload-build.sh b/upload-build.sh index c89be51ca9..d3f010fdd7 100644 --- a/upload-build.sh +++ b/upload-build.sh @@ -17,7 +17,8 @@ if [ ! -e $FILE1 ]; then touch $FILE1 fi -echo "This is the latest build of #"$TRAVIS_COMMIT" >>Desktop download: ["$DESKFILE"]("$DESKFILE")" >> $FILE1 +MSG=$"### Travis build #"$TRAVIS_BUILD_NUMBER".\n####Desktop JAR download: ["$DESKFILE"]("$DESKFILE")" >> $FILE1 +echo "$MSG" git add $FILE1 git add $DESKFILE