mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-21 21:38:29 +03:00
Updated uCore, bugfixes, changed build script
This commit is contained in:
parent
1f4a72d459
commit
30b4b78f9f
@ -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
|
||||
|
@ -24,7 +24,7 @@ allprojects {
|
||||
appName = 'Mindustry'
|
||||
gdxVersion = '1.9.8'
|
||||
aiVersion = '1.8.1'
|
||||
uCoreVersion = 'a480029'
|
||||
uCoreVersion = '629405c'
|
||||
|
||||
getVersionString = {
|
||||
String buildVersion = getBuildVersion()
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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){
|
||||
|
@ -65,7 +65,7 @@ task debug(dependsOn: classes, type: JavaExec) {
|
||||
|
||||
task dist(type: Jar) {
|
||||
dependsOn classes
|
||||
|
||||
|
||||
writeVersion()
|
||||
|
||||
from files(sourceSets.main.output.classesDirs)
|
||||
|
Loading…
Reference in New Issue
Block a user