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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-05-21 11:04:59 -04:00
parent 684b84310b 1c9ad2266d
commit b562c30381
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/PlayerComp.java
View File

@@ -180,7 +180,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
}
if(Core.settings.getBool("playerchat") && ((textFadeTime > 0 && lastText != null) || typing)){
String text = textFadeTime <= 0 || lastText == null ? "[LIGHT_GRAY]" + Strings.animated(Time.time(), 4, 15f, ".") : lastText;
String text = textFadeTime <= 0 || lastText == null ? "[lightgray]" + Strings.animated(Time.time(), 4, 15f, ".") : lastText;
float width = 100f;
float visualFadeTime = 1f - Mathf.curve(1f - textFadeTime, 0.9f);
font.setColor(1f, 1f, 1f, textFadeTime <= 0 || lastText == null ? 1f : visualFadeTime);

2
core/src/mindustry/ui/ContentDisplay.java
View File

@@ -48,7 +48,7 @@ public class ContentDisplay{
for(BlockStat stat : map.keys()){
table.table(inset -> {
inset.left();
inset.add("[LIGHT_GRAY]" + stat.localized() + ":[] ").left();
inset.add("[lightgray]" + stat.localized() + ":[] ").left();
Array<StatValue> arr = map.get(stat);
for(StatValue value : arr){
value.display(inset);

2
core/src/mindustry/ui/dialogs/AdminsDialog.java
View File

@@ -36,7 +36,7 @@ public class AdminsDialog extends FloatingDialog{
Table res = new Table(Tex.button);
res.margin(14f);
res.labelWrap("[LIGHT_GRAY]" + info.lastName).width(w - h - 24f);
res.labelWrap("[lightgray]" + info.lastName).width(w - h - 24f);
res.add().growX();
res.button(Icon.cancel, () -> {
ui.showConfirm("$confirm", "$confirmunadmin", () -> {

2
core/src/mindustry/ui/dialogs/BansDialog.java
View File

@@ -37,7 +37,7 @@ public class BansDialog extends FloatingDialog{
Table res = new Table(Tex.button);
res.margin(14f);
res.labelWrap("IP: [LIGHT_GRAY]" + info.lastIP + "\n[]Name: [LIGHT_GRAY]" + info.lastName).width(w - h - 24f);
res.labelWrap("IP: [lightgray]" + info.lastIP + "\n[]Name: [lightgray]" + info.lastName).width(w - h - 24f);
res.add().growX();
res.button(Icon.cancel, () -> {
ui.showConfirm("$confirm", "$confirmunban", () -> {

2
core/src/mindustry/ui/dialogs/GameOverDialog.java
View File

@@ -70,7 +70,7 @@ public class GameOverDialog extends FloatingDialog{
for(Item item : content.items()){
if(state.stats.itemsDelivered.get(item, 0) > 0){
t.table(items -> {
items.add(" [LIGHT_GRAY]" + state.stats.itemsDelivered.get(item, 0));
items.add(" [lightgray]" + state.stats.itemsDelivered.get(item, 0));
items.image(item.icon(Cicon.small)).size(8 * 3).pad(4);
}).left();
t.row();