Updated sprites/UI colors
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 340 B After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 466 B After Width: | Height: | Size: 7.6 KiB |
Before Width: | Height: | Size: 409 B After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 437 B After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1.0 MiB |
Before Width: | Height: | Size: 276 KiB After Width: | Height: | Size: 276 KiB |
@ -43,7 +43,7 @@ public class Mindustry extends ApplicationCore{
|
|||||||
|
|
||||||
int targetfps = Core.settings.getInt("fpscap", 120);
|
int targetfps = Core.settings.getInt("fpscap", 120);
|
||||||
|
|
||||||
if(targetfps > 0 && targetfps <= 120){
|
if(targetfps > 0 && targetfps <= 240){
|
||||||
long target = (1000 * 1000000) / targetfps; //target in nanos
|
long target = (1000 * 1000000) / targetfps; //target in nanos
|
||||||
long elapsed = Time.timeSinceNanos(lastTime);
|
long elapsed = Time.timeSinceNanos(lastTime);
|
||||||
if(elapsed < target){
|
if(elapsed < target){
|
||||||
|
@ -7,7 +7,7 @@ import io.anuke.arc.scene.ui.layout.Unit;
|
|||||||
import io.anuke.mindustry.graphics.Pal;
|
import io.anuke.mindustry.graphics.Pal;
|
||||||
|
|
||||||
public class BorderImage extends Image{
|
public class BorderImage extends Image{
|
||||||
private float thickness = 3f;
|
private float thickness = 4f;
|
||||||
|
|
||||||
public BorderImage(){
|
public BorderImage(){
|
||||||
|
|
||||||
@ -34,7 +34,7 @@ public class BorderImage extends Image{
|
|||||||
float scaleX = getScaleX();
|
float scaleX = getScaleX();
|
||||||
float scaleY = getScaleY();
|
float scaleY = getScaleY();
|
||||||
|
|
||||||
Draw.color(Pal.accent);
|
Draw.color(Pal.gray);
|
||||||
Draw.alpha(parentAlpha);
|
Draw.alpha(parentAlpha);
|
||||||
Lines.stroke(Unit.dp.scl(thickness));
|
Lines.stroke(Unit.dp.scl(thickness));
|
||||||
Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
|
Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
|
||||||
|
@ -184,7 +184,7 @@ public class SettingsMenuDialog extends SettingsDialog{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
|
graphics.sliderPref("fpscap", 241, 5, 241, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
|
||||||
graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%");
|
graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%");
|
||||||
|
|
||||||
if(!mobile){
|
if(!mobile){
|
||||||
|
@ -9,6 +9,7 @@ import io.anuke.arc.scene.ui.Image;
|
|||||||
import io.anuke.arc.scene.ui.layout.Table;
|
import io.anuke.arc.scene.ui.layout.Table;
|
||||||
import io.anuke.arc.scene.ui.layout.Unit;
|
import io.anuke.arc.scene.ui.layout.Unit;
|
||||||
import io.anuke.arc.util.Interval;
|
import io.anuke.arc.util.Interval;
|
||||||
|
import io.anuke.arc.util.Scaling;
|
||||||
import io.anuke.mindustry.core.GameState.State;
|
import io.anuke.mindustry.core.GameState.State;
|
||||||
import io.anuke.mindustry.gen.Call;
|
import io.anuke.mindustry.gen.Call;
|
||||||
import io.anuke.mindustry.graphics.Pal;
|
import io.anuke.mindustry.graphics.Pal;
|
||||||
@ -81,15 +82,15 @@ public class PlayerListFragment extends Fragment{
|
|||||||
@Override
|
@Override
|
||||||
public void draw(){
|
public void draw(){
|
||||||
super.draw();
|
super.draw();
|
||||||
Draw.color(Pal.accent);
|
Draw.color(Pal.gray);
|
||||||
Draw.alpha(parentAlpha);
|
Draw.alpha(parentAlpha);
|
||||||
Lines.stroke(Unit.dp.scl(3f));
|
Lines.stroke(Unit.dp.scl(4f));
|
||||||
Lines.rect(x, y, width, height);
|
Lines.rect(x, y, width, height);
|
||||||
Draw.reset();
|
Draw.reset();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
table.margin(8);
|
table.margin(8);
|
||||||
table.add(new Image(user.mech.iconRegion)).grow();
|
table.add(new Image(user.mech.getContentIcon()).setScaling(Scaling.none)).grow();
|
||||||
|
|
||||||
button.add(table).size(h);
|
button.add(table).size(h);
|
||||||
button.labelWrap("[#" + user.color.toString().toUpperCase() + "]" + user.name).width(170f).pad(10);
|
button.labelWrap("[#" + user.color.toString().toUpperCase() + "]" + user.name).width(170f).pad(10);
|
||||||
@ -135,7 +136,7 @@ public class PlayerListFragment extends Fragment{
|
|||||||
|
|
||||||
content.add(button).padBottom(-6).width(350f).maxHeight(h + 14);
|
content.add(button).padBottom(-6).width(350f).maxHeight(h + 14);
|
||||||
content.row();
|
content.row();
|
||||||
content.addImage("whiteui").height(3f).color(state.rules.pvp ? user.getTeam().color : Pal.accent).growX();
|
content.addImage("whiteui").height(4f).color(state.rules.pvp ? user.getTeam().color : Pal.gray).growX();
|
||||||
content.row();
|
content.row();
|
||||||
});
|
});
|
||||||
|
|
||||||
|