Fixed web errors / Fixed IPv4 crash
This commit is contained in:
+2
-2
@@ -27,7 +27,7 @@ allprojects {
|
||||
appName = 'Mindustry'
|
||||
gdxVersion = '1.9.8'
|
||||
roboVMVersion = '2.3.0'
|
||||
uCoreVersion = '115a42ff7d5bca0a6073b5f1e0b67cc4464c560e'
|
||||
uCoreVersion = '1a357ce1714f20663ec1680f64f4ff43631de07d'
|
||||
|
||||
getVersionString = {
|
||||
String buildVersion = getBuildVersion()
|
||||
@@ -92,7 +92,7 @@ project(":desktop") {
|
||||
dependencies {
|
||||
compile project(":core")
|
||||
compile project(":kryonet")
|
||||
if(new File(projectDir.parent, '../debug').exists()) compile project(":debug")
|
||||
if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug")
|
||||
|
||||
compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
|
||||
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.entities.effect"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.entities.bullet.Bullet"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.game.Team"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.maps.missions.Mission"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.type.Item"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.world.meta.BlockBar"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.maps.generation.WorldGenerator"/>
|
||||
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.entities.StatusController"/>
|
||||
|
||||
@@ -78,7 +78,10 @@ public abstract class GroundUnit extends BaseUnit{
|
||||
},
|
||||
patrol = new UnitState(){
|
||||
public void update(){
|
||||
//TODO
|
||||
target = getClosestCore();
|
||||
if(target != null){
|
||||
//circle(60f + Mathf.absin(Timers.time() + id*23525, 70f, 1200f));
|
||||
}
|
||||
}
|
||||
},
|
||||
retreat = new UnitState(){
|
||||
|
||||
@@ -98,6 +98,7 @@ task packrCmd() {
|
||||
"--jdk", PACKR_DIR + "jdk-" + getPlatform() + ".zip",
|
||||
"--icon", ICON_DIR.getAbsolutePath(),
|
||||
"--vmargs", (getPlatform().equals("mac") ? "XstartOnFirstThread" : "Xms256m"),
|
||||
"Djava.net.preferIPv4Stack=true",
|
||||
"--classpath", "--", PACKR_DIR + "config.json")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user