mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-14 17:57:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Updated uCore

Browse Source
This commit is contained in:
Anuken
2018-04-14 13:49:42 -04:00
parent 439d2c88ae
commit 4b6b1b43cd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = '5e20b05' uCoreVersion = 'a6f9111'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Thu Apr 12 17:32:28 EDT 2018 #Sat Apr 14 13:49:06 EDT 2018
version=release version=release
androidBuildCode=511 androidBuildCode=512
name=Mindustry name=Mindustry
code=3.5 code=3.5
build=custom build build=custom build

12
core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
View File

@ -1,6 +1,5 @@
package io.anuke.mindustry.mapeditor; package io.anuke.mindustry.mapeditor;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
@ -27,6 +26,7 @@ import io.anuke.ucore.scene.builders.table;
import io.anuke.ucore.scene.ui.*; import io.anuke.ucore.scene.ui.*;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Input;
import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
@ -340,20 +340,20 @@ public class MapEditorDialog extends Dialog{
} }
//ctrl keys (undo, redo, save) //ctrl keys (undo, redo, save)
if(Inputs.keyDown(Keys.CONTROL_LEFT)){ if(Inputs.keyDown(Input.CONTROL_LEFT)){
if(Inputs.keyTap(Keys.Z)){ if(Inputs.keyTap(Input.Z)){
view.undo(); view.undo();
} }
if(Inputs.keyTap(Keys.Y)){ if(Inputs.keyTap(Input.Y)){
view.redo(); view.redo();
} }
if(Inputs.keyTap(Keys.S)){ if(Inputs.keyTap(Input.S)){
saveDialog.save(); saveDialog.save();
} }
if(Inputs.keyTap(Keys.G)){ if(Inputs.keyTap(Input.G)){
view.setGrid(!view.isGrid()); view.setGrid(!view.isGrid());
} }
} }

4
core/src/io/anuke/mindustry/mapeditor/MapView.java
View File

@ -1,6 +1,5 @@
package io.anuke.mindustry.mapeditor; package io.anuke.mindustry.mapeditor;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Colors; import com.badlogic.gdx.graphics.Colors;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
@ -27,6 +26,7 @@ import io.anuke.ucore.scene.event.InputListener;
import io.anuke.ucore.scene.event.Touchable; import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.ui.TextField; import io.anuke.ucore.scene.ui.TextField;
import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Input;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp; import io.anuke.ucore.util.Tmp;
@ -182,7 +182,7 @@ public class MapView extends Element implements GestureListener{
super.act(delta); super.act(delta);
if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) && if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) &&
!Inputs.keyDown(Keys.CONTROL_LEFT)) { !Inputs.keyDown(Input.CONTROL_LEFT)) {
float ax = Inputs.getAxis("move_x"); float ax = Inputs.getAxis("move_x");
float ay = Inputs.getAxis("move_y"); float ay = Inputs.getAxis("move_y");
offsetx -= ax * 15f / zoom; offsetx -= ax * 15f / zoom;