diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index b26968cd34..01d804c3fd 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -16,7 +16,7 @@ android:theme="@style/GdxTheme" > diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json index 3dc8e615f4..f6fe02ba53 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -62,7 +62,7 @@ io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: { emptytoggle: {imageCheckedColor: white, imageDownColor: white, imageUpColor: lightgray}, static: {up: button }, static-down: {up: button-down }, - toggle: {checked: button-down, down: button-down, up: button }, + toggle: {checked: button-down, down: button-down, up: button, imageDisabledColor: lightgray, imageUpColor: white }, togglemap: {down: button-map-down, up: button-map }, select: {checked: button-select, up: clear }, close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button } diff --git a/core/assets/version.properties b/core/assets/version.properties index 2e924b0011..a9825b575f 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Mon Feb 26 19:08:43 EST 2018 +#Mon Feb 26 22:02:38 EST 2018 version=release -androidBuildCode=292 +androidBuildCode=303 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index a65d1d39c8..5c7758e053 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -283,7 +283,7 @@ public class NetServer extends Module{ }else if(packet.action == AdminAction.trace){ TracePacket trace = new TracePacket(); trace.info = admins.getTrace(ip); - Net.sendTo(other.clientid, trace, SendMode.tcp); + Net.sendTo(id, trace, SendMode.tcp); Log.info("&lc{0} has requested trace info of {1}.", player.name, other.name); } }); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java index f660fe6616..8cd8abbb6e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java @@ -24,13 +24,14 @@ public class BackgroundFragment implements Fragment { Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2 +240f, h/2 - back.getRegionHeight()*backscl/2 + 250f, back.getRegionWidth()*backscl, back.getRegionHeight()*backscl); - float logoscl = (int)Unit.dp.scl(7); + boolean portrait = Gdx.graphics.getWidth() < Gdx.graphics.getHeight(); + float logoscl = (int)Unit.dp.scl(7) * (portrait ? 5f/7f : 1f); TextureRegion logo = Core.skin.getRegion("logotext"); float logow = logo.getRegionWidth()*logoscl; float logoh = logo.getRegionHeight()*logoscl; Draw.color(); - Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh); + Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15 + (portrait ? -Unit.dp.scl(30f) : 0f), logow, logoh); }).visible(() -> state.is(State.menu)).grow(); } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index a070fb1981..d7bc4c65a8 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -15,6 +15,7 @@ import io.anuke.ucore.scene.Element; import io.anuke.ucore.scene.builders.button; import io.anuke.ucore.scene.builders.label; import io.anuke.ucore.scene.builders.table; +import io.anuke.ucore.scene.event.Touchable; import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.layout.Stack; import io.anuke.ucore.scene.ui.layout.Table; @@ -160,8 +161,10 @@ public class PlayerListFragment implements Fragment{ NetEvents.handleAdminSet(player, true); }); } - }).update(b -> b.setChecked(connection != null && netServer.admins.isAdmin(connection.address))) - .disabled(Net.client()); + }).update(b ->{ + b.setChecked(connection != null && netServer.admins.isAdmin(connection.address)); + b.setDisabled(Net.client()); + }).get().setTouchable(() -> Net.client() ? Touchable.disabled : Touchable.enabled); //TODO trace info for player t.addImageButton("icon-zoom-small", 14*2, () -> NetEvents.handleTraceRequest(player));