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

Fixed web errors / Fixed IPv4 crash

Browse Source
This commit is contained in:
Anuken
2018-09-25 23:27:19 -04:00
parent 57fce0ddbc
commit 1160a14f56
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -27,7 +27,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '115a42ff7d5bca0a6073b5f1e0b67cc4464c560e' uCoreVersion = '1a357ce1714f20663ec1680f64f4ff43631de07d'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()
@@ -92,7 +92,7 @@ project(":desktop") {
dependencies { dependencies {
compile project(":core") compile project(":core")
compile project(":kryonet") 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-backend-lwjgl3:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"

2
core/src/Mindustry.gwt.xml
View File

@@ -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.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.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.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.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.maps.generation.WorldGenerator"/>
<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.entities.StatusController"/> <extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.entities.StatusController"/>

5
core/src/io/anuke/mindustry/entities/units/GroundUnit.java
View File

@@ -78,7 +78,10 @@ public abstract class GroundUnit extends BaseUnit{
}, },
patrol = new UnitState(){ patrol = new UnitState(){
public void update(){ public void update(){
//TODO target = getClosestCore();
if(target != null){
//circle(60f + Mathf.absin(Timers.time() + id*23525, 70f, 1200f));
}
} }
}, },
retreat = new UnitState(){ retreat = new UnitState(){

1
desktop/build.gradle
View File

@@ -98,6 +98,7 @@ task packrCmd() {
"--jdk", PACKR_DIR + "jdk-" + getPlatform() + ".zip", "--jdk", PACKR_DIR + "jdk-" + getPlatform() + ".zip",
"--icon", ICON_DIR.getAbsolutePath(), "--icon", ICON_DIR.getAbsolutePath(),
"--vmargs", (getPlatform().equals("mac") ? "XstartOnFirstThread" : "Xms256m"), "--vmargs", (getPlatform().equals("mac") ? "XstartOnFirstThread" : "Xms256m"),
"Djava.net.preferIPv4Stack=true",
"--classpath", "--", PACKR_DIR + "config.json") "--classpath", "--", PACKR_DIR + "config.json")
} }
} }