diff --git a/.travis.yml b/.travis.yml index 06a66fa107..a2d36d4152 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ android: - addon-google_apis-google-26 script: - - ./gradlew desktop:dist + - ./gradlew desktop:dist -Pbuildversion=bleeding edge build after_success: - chmod +x upload-build.sh diff --git a/build.gradle b/build.gradle index 8d85801fc5..da96e87804 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = 'a480029' + uCoreVersion = '629405c' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/version.properties b/core/assets/version.properties index 8703f4dbfb..3816567416 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Thu Feb 08 23:39:41 EST 2018 +#Fri Feb 09 00:15:08 EST 2018 version=beta -androidBuildCode=124 +androidBuildCode=131 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index a05dc75a4e..4972c145e0 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -48,7 +48,7 @@ public class NetServer extends Module{ Net.handleServer(ConnectPacket.class, (id, packet) -> { - if(packet.version != Version.build && packet.version != -1){ //ignore 'custom builds' + if(packet.version != Version.build && packet.version != -1 && Version.build != -1){ //ignore 'custom builds' on both ends Net.kickConnection(id, packet.version > Version.build ? KickReason.serverOutdated : KickReason.clientOutdated); return; } diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java index 1c0a92d95e..8050b08d20 100644 --- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java +++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java @@ -141,7 +141,7 @@ public class Enemy extends SyncEntity { this.health = health; - interpolator.read(this.x, this.y, x, y, angle, time); + interpolator.read(this.x, this.y, x, y, angle/2f, time); } public void shoot(BulletType bullet){ diff --git a/desktop/build.gradle b/desktop/build.gradle index e124270646..b8cc277507 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -65,7 +65,7 @@ task debug(dependsOn: classes, type: JavaExec) { task dist(type: Jar) { dependsOn classes - + writeVersion() from files(sourceSets.main.output.classesDirs)