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

Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source 
# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java
This commit is contained in:
Anuken
2018-03-03 18:06:57 -05:00
parent 70b104c936 3653135bb0
commit 6de48b4535
23 changed files with 425 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
View File

@@ -15,7 +15,6 @@ import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Log.LogHandler;
import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.*;
@@ -68,9 +67,7 @@ public class DebugFragment implements Fragment {
});
row();
new button("spawn", () -> {
for(int i = 0; i < 30; i ++){
new Enemy(EnemyTypes.healer).set(player.x + Mathf.range(50f), player.y + Mathf.range(50f)).add();
}
new Enemy(EnemyTypes.healer).set(player.x, player.y).add();
});
row();
}}.end();