Fixed some minor bugs with teleporters an changelog
This commit is contained in:
@@ -115,6 +115,8 @@ text.openlink=Open Link
|
|||||||
text.back=Back
|
text.back=Back
|
||||||
text.quit.confirm=Are you sure you want to quit?
|
text.quit.confirm=Are you sure you want to quit?
|
||||||
text.changelog.title=Changelog
|
text.changelog.title=Changelog
|
||||||
|
text.changelog.loading=Getting changelog...
|
||||||
|
text.changelog.error.android=[orange]Note that the changelog does not work on Android 4.4 and below!\nThis is due to an internal Android bug.
|
||||||
text.changelog.error=[scarlet]Error getting changelog!\nCheck your internet connection.
|
text.changelog.error=[scarlet]Error getting changelog!\nCheck your internet connection.
|
||||||
text.changelog.current=[yellow][[Current version]
|
text.changelog.current=[yellow][[Current version]
|
||||||
text.changelog.latest=[orange][[Latest version]
|
text.changelog.latest=[orange][[Latest version]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#Autogenerated file. Do not modify.
|
#Autogenerated file. Do not modify.
|
||||||
#Tue Mar 13 11:43:39 EDT 2018
|
#Tue Mar 13 13:31:03 EDT 2018
|
||||||
version=release
|
version=release
|
||||||
androidBuildCode=369
|
androidBuildCode=380
|
||||||
name=Mindustry
|
name=Mindustry
|
||||||
code=3.4
|
code=3.4
|
||||||
build=custom build
|
build=34
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ public class DesktopInput extends InputHandler{
|
|||||||
|
|
||||||
@Override public float getCursorEndX(){ return endx; }
|
@Override public float getCursorEndX(){ return endx; }
|
||||||
@Override public float getCursorEndY(){ return endy; }
|
@Override public float getCursorEndY(){ return endy; }
|
||||||
@Override public float getCursorX(){ return (Graphics.screen(mousex, mousey).x); }
|
@Override public float getCursorX(){ return Graphics.screen(mousex, mousey).x; }
|
||||||
@Override public float getCursorY(){ return (Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y); }
|
@Override public float getCursorY(){ return Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y; }
|
||||||
@Override public boolean drawPlace(){ return !beganBreak; }
|
@Override public boolean drawPlace(){ return !beganBreak; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
|
|||||||
|
|
||||||
import com.badlogic.gdx.Gdx;
|
import com.badlogic.gdx.Gdx;
|
||||||
import com.badlogic.gdx.utils.Array;
|
import com.badlogic.gdx.utils.Array;
|
||||||
|
import io.anuke.mindustry.Vars;
|
||||||
import io.anuke.mindustry.io.Changelogs;
|
import io.anuke.mindustry.io.Changelogs;
|
||||||
import io.anuke.mindustry.io.Changelogs.VersionInfo;
|
import io.anuke.mindustry.io.Changelogs.VersionInfo;
|
||||||
import io.anuke.mindustry.io.Version;
|
import io.anuke.mindustry.io.Version;
|
||||||
@@ -17,6 +18,10 @@ public class ChangelogDialog extends FloatingDialog{
|
|||||||
public ChangelogDialog(){
|
public ChangelogDialog(){
|
||||||
super("$text.changelog.title");
|
super("$text.changelog.title");
|
||||||
|
|
||||||
|
addCloseButton();
|
||||||
|
|
||||||
|
content().add("$text.changelog.loading");
|
||||||
|
|
||||||
Changelogs.getChangelog(result -> {
|
Changelogs.getChangelog(result -> {
|
||||||
versions = result;
|
versions = result;
|
||||||
Gdx.app.postRunnable(this::setup);
|
Gdx.app.postRunnable(this::setup);
|
||||||
@@ -30,12 +35,15 @@ public class ChangelogDialog extends FloatingDialog{
|
|||||||
Table table = new Table();
|
Table table = new Table();
|
||||||
ScrollPane pane = new ScrollPane(table, "clear");
|
ScrollPane pane = new ScrollPane(table, "clear");
|
||||||
|
|
||||||
|
content().clear();
|
||||||
content().add(pane).grow();
|
content().add(pane).grow();
|
||||||
|
|
||||||
addCloseButton();
|
|
||||||
|
|
||||||
if(versions == null){
|
if(versions == null){
|
||||||
table.add("$text.changelog.error");
|
table.add("$text.changelog.error");
|
||||||
|
if(Vars.android){
|
||||||
|
table.row();
|
||||||
|
table.add("$text.changelog.error.android").padTop(8);
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
for(VersionInfo info : versions){
|
for(VersionInfo info : versions){
|
||||||
Table in = new Table("clear");
|
Table in = new Table("clear");
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ public class Block{
|
|||||||
public void configure(Tile tile, byte data){}
|
public void configure(Tile tile, byte data){}
|
||||||
|
|
||||||
public void setConfigure(Tile tile, byte data){
|
public void setConfigure(Tile tile, byte data){
|
||||||
|
configure(tile, data);
|
||||||
if(Net.active()) NetEvents.handleBlockConfig(tile, data);
|
if(Net.active()) NetEvents.handleBlockConfig(tile, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -117,7 +117,6 @@ public class Teleporter extends PowerBlock{
|
|||||||
for(int i = 0; i < colors; i ++){
|
for(int i = 0; i < colors; i ++){
|
||||||
final int f = i;
|
final int f = i;
|
||||||
ImageButton button = cont.addImageButton("white", "toggle", 24, () -> {
|
ImageButton button = cont.addImageButton("white", "toggle", 24, () -> {
|
||||||
entity.color = (byte)f;
|
|
||||||
lastColor = (byte)f;
|
lastColor = (byte)f;
|
||||||
setConfigure(tile, (byte)f);
|
setConfigure(tile, (byte)f);
|
||||||
}).size(34, 38).padBottom(-5.1f).group(group).get();
|
}).size(34, 38).padBottom(-5.1f).group(group).get();
|
||||||
|
|||||||
Reference in New Issue
Block a user