mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 23:11:12 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2021-09-07 17:57:17 -04:00
commit 8adefb7b72
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before After
Before After

2
core/assets/bundles/bundle.properties
View file

@ -401,6 +401,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.units.hide = Hide All
waves.units.show = Show All
#these are intentionally in lower case
wavemode.counts = counts

11
core/src/mindustry/editor/WaveGraph.java
View file

@ -181,6 +181,17 @@ public class WaveGraph extends Table{
colors.clear();
colors.left();
colors.button("@waves.units.hide", Styles.cleart, () -> {
if(hidden.size == usedCopy.size){
hidden.clear();
}else{
hidden.addAll(usedCopy);
}
used.clear();
used.addAll(usedCopy);
for(UnitType o : hidden) used.remove(o);
}).update(b -> b.setText(hidden.size == usedCopy.size ? "@waves.units.show" : "@waves.units.hide")).height(32f).width(130f);
colors.pane(t -> {
t.left();
for(UnitType type : used){

2
core/src/mindustry/ui/dialogs/DatabaseDialog.java
View file

@ -36,7 +36,7 @@ public class DatabaseDialog extends BaseDialog{
cont.table(s -> {
s.image(Icon.zoom).padRight(8);
search = s.field(null, text -> rebuild()).growX().get();
search.setMessageText(Core.bundle.get("players.search"));
search.setMessageText("@players.search");
}).fillX().padBottom(4).row();
cont.pane(all);