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

More helpful in-game edit button

Browse Source
This commit is contained in:
Anuken
2019-05-13 11:47:38 -04:00
parent 79a2f31056
commit 4d40af6ac0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -200,6 +200,7 @@ editor.author = Author:
editor.description = Description: editor.description = Description:
editor.waves = Waves: editor.waves = Waves:
editor.rules = Rules: editor.rules = Rules:
editor.ingame = Edit In-Game
waves.title = Waves waves.title = Waves
waves.remove = Remove waves.remove = Remove
waves.never = <never> waves.never = <never>

4
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -135,14 +135,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
menu.cont.row(); menu.cont.row();
menu.cont.addImageTextButton("$play", "icon-play", isize, this::playtest).padTop(-5).size(swidth * 2f + 10, 60f); menu.cont.addImageTextButton("$editor.ingame", "icon-arrow", isize, this::playtest).padTop(-5).size(swidth * 2f + 10, 60f);
menu.cont.row(); menu.cont.row();
menu.cont.addImageTextButton("$quit", "icon-back", isize, () -> { menu.cont.addImageTextButton("$quit", "icon-back", isize, () -> {
tryExit(); tryExit();
menu.hide(); menu.hide();
}).padTop(-5).size(swidth * 2f + 10, 60f); }).size(swidth * 2f + 10, 60f);
resizeDialog = new MapResizeDialog(editor, (x, y) -> { resizeDialog = new MapResizeDialog(editor, (x, y) -> {
if(!(editor.width() == x && editor.height() == y)){ if(!(editor.width() == x && editor.height() == y)){

2
core/src/io/anuke/mindustry/editor/MapInfoDialog.java
View File

@@ -40,7 +40,6 @@ public class MapInfoDialog extends FloatingDialog{
name.setMessageText("$unknown"); name.setMessageText("$unknown");
cont.row(); cont.row();
cont.add("$editor.description").padRight(8).left(); cont.add("$editor.description").padRight(8).left();
TextArea description = cont.addArea(tags.get("description", ""), "textarea", text -> { TextArea description = cont.addArea(tags.get("description", ""), "textarea", text -> {
@@ -48,7 +47,6 @@ public class MapInfoDialog extends FloatingDialog{
}).size(400f, 140f).get(); }).size(400f, 140f).get();
cont.row(); cont.row();
cont.add("$editor.author").padRight(8).left(); cont.add("$editor.author").padRight(8).left();
TextField author = cont.addField(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> { TextField author = cont.addField(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> {

1
core/src/io/anuke/mindustry/ui/BorderImage.java
View File

@@ -35,6 +35,7 @@ public class BorderImage extends Image{
float scaleY = getScaleY(); float scaleY = getScaleY();
Draw.color(Pal.accent); Draw.color(Pal.accent);
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);
Draw.reset(); Draw.reset();