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

Functional loading

Browse Source
This commit is contained in:
Anuken
2019-08-27 09:27:09 -04:00
parent 76cd7ba8d1
commit 1e80bdf19f
209 changed files with 383 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/Blocks.java
+3 -3
View File
@@ -26,7 +26,7 @@ import io.anuke.mindustry.world.consumers.*;
import io.anuke.mindustry.world.meta.*;
import io.anuke.mindustry.world.modules.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class Blocks implements ContentList{
public static Block
@@ -515,10 +515,10 @@ public class Blocks implements ContentList{
Draw.alpha(entity.warmup);
Lines.lineAngleCenter(
tile.drawx() + Mathf.sin(entity.totalProgress, 6f, Min.tilesize / 3f * size),
tile.drawx() + Mathf.sin(entity.totalProgress, 6f, Vars.tilesize / 3f * size),
tile.drawy(),
90,
size * Min.tilesize / 2f);
size * Vars.tilesize / 2f);
Draw.reset();
core/src/io/anuke/mindustry/content/Bullets.java
+1 -1
View File
@@ -12,7 +12,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*;
import static io.anuke.mindustry.Min.world;
import static io.anuke.mindustry.Vars.world;
public class Bullets implements ContentList{
public static BulletType
core/src/io/anuke/mindustry/content/Fx.java
+1 -1
View File
@@ -15,7 +15,7 @@ import io.anuke.mindustry.graphics.Drawf;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Item.Icon;
import static io.anuke.mindustry.Min.tilesize;
import static io.anuke.mindustry.Vars.tilesize;
public class Fx implements ContentList{
public static Effect