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

heck

Browse Source
This commit is contained in:
Anuken
2017-12-19 19:17:17 -05:00
parent ed59e7c7cb
commit 9e298bde03
96 changed files with 498 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
+9 -7
View File
@@ -2,6 +2,7 @@ package io.anuke.mindustry.mapeditor;
import java.util.Arrays;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture;
@@ -67,6 +68,7 @@ public class MapEditorDialog extends Dialog{
Vars.ui.showLoading();
Timers.run(3f, () -> {
try{
Gdx.app.error("MINDUSTRYAAAAAAAAAA", "Saving to file: " + result.toString() + " " + result.type());
Pixmaps.write(editor.pixmap(), result);
}catch (Exception e){
Vars.ui.showError("Error saving image file!");
@@ -150,7 +152,7 @@ public class MapEditorDialog extends Dialog{
public void build(){
new table(){{
float isize = Unit.dp.inPixels(14*3f);
float isize = Unit.dp.inPixels(16*2f);
aleft();
new table(){{
@@ -163,37 +165,37 @@ public class MapEditorDialog extends Dialog{
row();
new imagebutton("icon-cursor", 10f*3f, () -> {
new imagebutton("icon-resize", isize, () -> {
resizeDialog.show();
}).text("resize").padTop(4f);
row();
new imagebutton("icon-load", isize, () -> {
new imagebutton("icon-load-map", isize, () -> {
loadDialog.show();
}).text("load map");
row();
new imagebutton("icon-save", isize, ()->{
new imagebutton("icon-save-map", isize, ()->{
saveDialog.show();
}).text("save map");
row();
new imagebutton("icon-load", isize, () -> {
new imagebutton("icon-load-image", isize, () -> {
openFile.show();
}).text("load image");
row();
new imagebutton("icon-save", isize, () -> {
new imagebutton("icon-save-image", isize, () -> {
saveFile.show();
}).text("save image");
row();
new imagebutton("icon-arrow-left", isize, () -> {
new imagebutton("icon-back", isize, () -> {
if(!saved){
Vars.ui.showConfirm("Confirm Exit", "[scarlet]You have unsaved changes![]\nAre you sure you want to exit?", () -> hide());
}else{
core/src/io/anuke/mindustry/ui/FileChooser.java
+1 -1
View File
@@ -24,7 +24,7 @@ import io.anuke.ucore.scene.ui.layout.Unit;
public class FileChooser extends FloatingDialog{
private Table files;
private FileHandle homeDirectory = Gdx.files.local(Gdx.files.getExternalStoragePath());
private FileHandle homeDirectory = Gdx.files.absolute(Gdx.files.getExternalStoragePath());
private FileHandle directory = homeDirectory;
private ScrollPane pane;
private TextField navigation, filefield;
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class MenuFragment implements Fragment{
row();
new imagebutton("icon-terrain", isize, () -> ui.showEditor()).text("Editor").padTop(4f);
new imagebutton("icon-editor", isize, () -> ui.showEditor()).text("Editor").padTop(4f);
new imagebutton("icon-tools", isize, () -> ui.showPrefs()).text("Settings").padTop(4f);