RustyStriker/Klooni1010
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to gradle 3.3 and light cleanup.

Browse source
This commit is contained in:
Oliver Jan Krylow 2017-04-09 21:07:15 +02:00
parent cdd7983e84
commit ce26f12d4e
5 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java
View file

@ -4,7 +4,6 @@ import android.os.Bundle;
import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import io.github.lonamiwebs.klooni.Klooni;
public class AndroidLauncher extends AndroidApplication { public class AndroidLauncher extends AndroidApplication {
@Override @Override

2
build.gradle
View file

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
} }
} }

9
core/src/io/github/lonamiwebs/klooni/Klooni.java
View file

@ -41,7 +41,7 @@ public class Klooni extends Game {
skin.add("button_up", new NinePatch(new Texture( skin.add("button_up", new NinePatch(new Texture(
Gdx.files.internal("ui/button_up.png")), 28, 28, 28, 28)); Gdx.files.internal("ui/button_up.png")), 28, 28, 28, 28));
skin.add("button_down", new NinePatch(new Texture( skin.add("button_dscalableown", new NinePatch(new Texture(
Gdx.files.internal("ui/button_down.png")), 28, 28, 28, 28)); Gdx.files.internal("ui/button_down.png")), 28, 28, 28, 28));
skin.add("play_texture", new Texture(Gdx.files.internal("ui/play.png"))); skin.add("play_texture", new Texture(Gdx.files.internal("ui/play.png")));
@ -82,12 +82,7 @@ public class Klooni extends Game {
//endregion //endregion
//region Screen //region Screen
@Override
public void render() {
super.render();
}
// TransitionScreen will also dispose by default the previous screen // TransitionScreen will also dispose by default the previous screen
public void transitionTo(Screen screen) { public void transitionTo(Screen screen) {
transitionTo(screen, true); transitionTo(screen, true);

2
core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java
View file

@ -223,7 +223,7 @@ public class PieceHolder implements BinSerializable {
Gdx.input.getX(), Gdx.input.getX(),
Gdx.graphics.getHeight() - Gdx.input.getY()); // Y axis is inverted Gdx.graphics.getHeight() - Gdx.input.getY()); // Y axis is inverted
if (Klooni.onDesktop) { if (Klooni.onDesktop) { //FIXME(oliver): This is a bad assumption to make. There are desktops with touch input and non-desktops with mouse input.
// Center the piece to the mouse // Center the piece to the mouse
mouse.sub(piece.getRectangle().width * 0.5f, piece.getRectangle().height * 0.5f); mouse.sub(piece.getRectangle().width * 0.5f, piece.getRectangle().height * 0.5f);
} else { } else {

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat Jan 21 20:46:40 CET 2017 #Sat Apr 08 12:05:23 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip