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

Removed redundant sector mission display

Browse Source
This commit is contained in:
Anuken 2018-11-27 20:36:23 -05:00
parent 91468fa2f9
commit 76dd3c86f2
8 changed files with 801 additions and 814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/scroll-horizontal.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 B

After

Width:  |  Height:  |  Size: 178 B

BIN
core/assets-raw/sprites/ui/scroll-knob-horizontal-black.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 186 B

BIN
core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 187 B

BIN
core/assets-raw/sprites/ui/scroll.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 116 B

After

Width:  |  Height:  |  Size: 181 B

1603
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: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

1
core/assets/ui/uiskin.json
View File

@ -30,6 +30,7 @@ TextButtonStyle: {
discord: {font: default-font, fontColor: white, up: discord-banner}, discord: {font: default-font, fontColor: white, up: discord-banner},
info: {font: default-font, fontColor: white, up: info-banner}, info: {font: default-font, fontColor: white, up: info-banner},
clear-partial: {down: white, up: button-select, over: flat-down, font: default-font, fontColor: white, disabledFontColor: gray }, clear-partial: {down: white, up: button-select, over: flat-down, font: default-font, fontColor: white, disabledFontColor: gray },
clear-partial-2: {down: flat-over, up: none, over: flat-over, font: default-font, fontColor: white, disabledFontColor: gray },
empty: {font: default-font}, empty: {font: default-font},
toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: gray } toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: gray }
}, },

11
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@ -29,13 +29,8 @@ public class PausedDialog extends FloatingDialog{
void rebuild(){ void rebuild(){
missionTable.clear(); missionTable.clear();
if(world.getSector() != null && !world.getSector().complete){ missionTable.background("underline");
missionTable.add("[LIGHT_GRAY]" + Bundles.format("text.mission", "")); if(world.getSector() != null){
missionTable.row();
missionTable.table(t -> {
world.getSector().currentMission().display(t);
});
missionTable.row();
missionTable.add(Bundles.format("text.sector", world.getSector().x + ", " + world.getSector().y)); missionTable.add(Bundles.format("text.sector", world.getSector().x + ", " + world.getSector().y));
} }
} }
@ -47,7 +42,7 @@ public class PausedDialog extends FloatingDialog{
} }
}); });
content().table(t -> missionTable = t).colspan(mobile ? 3 : 1); content().table(t -> missionTable = t).colspan(mobile ? 3 : 2);
content().row(); content().row();
if(!mobile){ if(!mobile){