diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 3c8f51da08..041d62ace9 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -200,6 +200,7 @@ editor.author = Author: editor.description = Description: editor.waves = Waves: editor.rules = Rules: +editor.ingame = Edit In-Game waves.title = Waves waves.remove = Remove waves.never = diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index b8788df589..9c8fdaa87d 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -135,14 +135,14 @@ public class MapEditorDialog extends Dialog implements Disposable{ 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.addImageTextButton("$quit", "icon-back", isize, () -> { tryExit(); menu.hide(); - }).padTop(-5).size(swidth * 2f + 10, 60f); + }).size(swidth * 2f + 10, 60f); resizeDialog = new MapResizeDialog(editor, (x, y) -> { if(!(editor.width() == x && editor.height() == y)){ diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index dbe9ed3cbf..efd049d11f 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java @@ -40,7 +40,6 @@ public class MapInfoDialog extends FloatingDialog{ name.setMessageText("$unknown"); cont.row(); - cont.add("$editor.description").padRight(8).left(); TextArea description = cont.addArea(tags.get("description", ""), "textarea", text -> { @@ -48,7 +47,6 @@ public class MapInfoDialog extends FloatingDialog{ }).size(400f, 140f).get(); cont.row(); - cont.add("$editor.author").padRight(8).left(); TextField author = cont.addField(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> { diff --git a/core/src/io/anuke/mindustry/ui/BorderImage.java b/core/src/io/anuke/mindustry/ui/BorderImage.java index 0e14960df0..6c7a8e54d9 100644 --- a/core/src/io/anuke/mindustry/ui/BorderImage.java +++ b/core/src/io/anuke/mindustry/ui/BorderImage.java @@ -35,6 +35,7 @@ public class BorderImage extends Image{ float scaleY = getScaleY(); Draw.color(Pal.accent); + Draw.alpha(parentAlpha); Lines.stroke(Unit.dp.scl(thickness)); Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY); Draw.reset();