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

Fixed incorrect power source sprite

Browse Source
This commit is contained in:
Anuken
2019-04-30 00:07:38 -04:00
parent 3c643c917a
commit 6fd5f1563a
9 changed files with 870 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
core/assets-raw/sprites_replacement/blocks/power/power-infinite.png → core/assets-raw/sprites_replacement/blocks/power/power-source.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

BIN
core/assets/sprites/block_colors.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 502 B

861
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 280 KiB

889
core/assets/sprites/sprites_fallback.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites_fallback4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 400 KiB

After

Width:  |  Height:  |  Size: 400 KiB

BIN
core/assets/sprites/sprites_fallback5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 334 KiB

After

Width:  |  Height:  |  Size: 334 KiB

7
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -92,12 +92,9 @@ public class DesktopPlatform extends Platform{
} }
if(Net.active() && playerGroup.size() > 1){ if(Net.active() && playerGroup.size() > 1){
presence.state = playerGroup.size() + " Players"; presence.state = (state.rules.pvp ? "PvP | " : "") + playerGroup.size() + " Players";
}else if(state.rules.waves){ }else if(state.rules.waves){
presence.state = "Wave " + state.wave; presence.state = "Survival";
}else{
presence.state = unitGroups[player.getTeam().ordinal()].size() == 1 ? "1 Unit Active" :
(unitGroups[player.getTeam().ordinal()].size() + " Units Active");
} }
}else{ }else{
if(ui.editor != null && ui.editor.isShown()){ if(ui.editor != null && ui.editor.isShown()){