Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated uCore, bugfixes, changed build script

Browse Source
This commit is contained in:
Anuken
2018-02-09 00:15:27 -05:00
parent 1f4a72d459
commit 30b4b78f9f
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -14,7 +14,7 @@ android:
- addon-google_apis-google-26 - addon-google_apis-google-26
script: script:
- ./gradlew desktop:dist - ./gradlew desktop:dist -Pbuildversion=bleeding edge build
after_success: after_success:
- chmod +x upload-build.sh - chmod +x upload-build.sh

2
build.gradle
View File

@@ -24,7 +24,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = 'a480029' uCoreVersion = '629405c'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Thu Feb 08 23:39:41 EST 2018 #Fri Feb 09 00:15:08 EST 2018
version=beta version=beta
androidBuildCode=124 androidBuildCode=131
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=custom build build=custom build

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -48,7 +48,7 @@ public class NetServer extends Module{
Net.handleServer(ConnectPacket.class, (id, packet) -> { 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); Net.kickConnection(id, packet.version > Version.build ? KickReason.serverOutdated : KickReason.clientOutdated);
return; return;
} }

2
core/src/io/anuke/mindustry/entities/enemies/Enemy.java
View File

@@ -141,7 +141,7 @@ public class Enemy extends SyncEntity {
this.health = health; 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){ public void shoot(BulletType bullet){