mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-11 00:07:46 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-09-24 13:05:43 -04:00
parent 0a07458186 1d530f531d
commit da115e90bc
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -22,9 +22,9 @@ First, make sure you have [JDK 14](https://adoptopenjdk.net/) installed. Open a
#### Windows
_Running:_ `gradlew.bat desktop:run`
_Building:_ `gradlew.bat desktop:dist`
_Sprite Packing:_ `gradlew.bat tools:pack`
_Running:_ `gradlew desktop:run`
_Building:_ `gradlew desktop:dist`
_Sprite Packing:_ `gradlew tools:pack`
#### Linux/Mac OS

BIN
core/assets-raw/sprites/blocks/units/command-center-team.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 511 B

BIN
core/assets-raw/sprites/blocks/units/command-center.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 347 B

2
core/src/mindustry/graphics/IndexedRenderer.java
View File

@ -11,7 +11,7 @@ import arc.util.*;
public class IndexedRenderer implements Disposable{
private static final int vsize = 5;
private Shader program = new Shader(
private final Shader program = new Shader(
"attribute vec4 a_position;\n" +
"attribute vec4 a_color;\n" +
"attribute vec2 a_texCoord0;\n" +

1
core/src/mindustry/logic/RadarTarget.java
View File

@ -9,6 +9,7 @@ public enum RadarTarget{
ally((team, other) -> team == other.team),
player((team, other) -> other.isPlayer()),
flying((team, other) -> other.isFlying()),
boss((team, other) -> other.isBoss()),
ground((team, other) -> other.isGrounded());
public final RadarTargetFunc func;

4
core/src/mindustry/world/blocks/units/CommandCenter.java
View File

@ -20,7 +20,7 @@ import mindustry.world.meta.*;
public class CommandCenter extends Block{
public TextureRegionDrawable[] commandRegions = new TextureRegionDrawable[UnitCommand.all.length];
public Color topColor = Pal.command, bottomColor = Color.valueOf("5e5e5e");
public Color topColor = null, bottomColor = Color.valueOf("5e5e5e");
public Effect effect = Fx.commandSend;
public CommandCenter(String name){
@ -63,7 +63,7 @@ public class CommandCenter extends Block{
Draw.color(bottomColor);
Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
Draw.color(topColor);
Draw.color(topColor == null ? team.color : topColor);
Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
Draw.color();
}