Compare commits
10 commits
6985ae58b9
...
ec0b9ddfb5
Author | SHA1 | Date | |
---|---|---|---|
|
ec0b9ddfb5 | ||
|
13cd4877ea | ||
|
832e8d27aa | ||
|
8fabbfef8c | ||
|
68471bc30f | ||
|
21358abff9 | ||
|
5d88d63419 | ||
|
7bc26d9a62 | ||
|
2c7125710f | ||
|
b190ffb6b3 |
12 changed files with 78 additions and 8 deletions
53
.github/workflows/desktop-release.yml
vendored
Normal file
53
.github/workflows/desktop-release.yml
vendored
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
name: Automatic Desktop Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Set up JDK 1.8
|
||||||
|
uses: actions/setup-java@v1
|
||||||
|
with:
|
||||||
|
java-version: 1.8
|
||||||
|
|
||||||
|
- name: Grant execute permission for gradlew
|
||||||
|
run: chmod +x gradlew
|
||||||
|
|
||||||
|
- name: Build with Gradle
|
||||||
|
run: ./gradlew desktop:dist
|
||||||
|
|
||||||
|
- name: Define env vars
|
||||||
|
id: vars
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=jar_file::\
|
||||||
|
$(echo ./desktop/build/libs/*.jar)
|
||||||
|
echo ::set-output name=version::\
|
||||||
|
$(echo ./desktop/build/libs/*.jar | sed 's/.*-\([0-9.]\+\)\.jar/\1/')
|
||||||
|
|
||||||
|
- name: Create release
|
||||||
|
id: create_release
|
||||||
|
uses: actions/create-release@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
tag_name: ${{ github.ref }}
|
||||||
|
release_name: ${{ github.ref }}
|
||||||
|
draft: false
|
||||||
|
prerelease: false
|
||||||
|
|
||||||
|
- name: Upload release asset
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
|
asset_path: ${{ steps.vars.outputs.jar_file }}
|
||||||
|
asset_name: Klooni-${{ steps.vars.outputs.version }}.jar
|
||||||
|
asset_content_type: application/java-archive
|
|
@ -4,6 +4,8 @@ Play 1010! for free! Add your own themes! Contribute! Make the game yours!
|
||||||
|
|
||||||
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/dev.lonami.klooni)
|
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/dev.lonami.klooni)
|
||||||
|
|
||||||
|
(Desktop builds are available on the [releases page](https://github.com/LonamiWebs/Klooni1010/releases).)
|
||||||
|
|
||||||
This project is licensed under [GPLv3+](LICENSE).
|
This project is licensed under [GPLv3+](LICENSE).
|
||||||
|
|
||||||
**Table of contents**:
|
**Table of contents**:
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="dev.lonami.klooni" >
|
package="dev.lonami.klooni"
|
||||||
|
android:installLocation="auto">
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
|
|
|
@ -21,8 +21,8 @@ android {
|
||||||
//noinspection MinSdkTooLow
|
//noinspection MinSdkTooLow
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 840
|
versionCode 860
|
||||||
versionName "0.8.4"
|
versionName "0.8.6"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -17,15 +17,31 @@
|
||||||
*/
|
*/
|
||||||
package dev.lonami.klooni;
|
package dev.lonami.klooni;
|
||||||
|
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.os.StrictMode;
|
||||||
|
|
||||||
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 java.lang.reflect.Method;
|
||||||
|
|
||||||
public class AndroidLauncher extends AndroidApplication {
|
public class AndroidLauncher extends AndroidApplication {
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// FIXME: Hack to allow us use the old way to share files
|
||||||
|
// https://stackoverflow.com/a/42437379/
|
||||||
|
if (Build.VERSION.SDK_INT >= 24) {
|
||||||
|
try {
|
||||||
|
Method m = StrictMode.class.getMethod("disableDeathOnFileUriExposure");
|
||||||
|
m.invoke(null);
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
|
final AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
|
||||||
final AndroidShareChallenge shareChallenge = new AndroidShareChallenge(this);
|
final AndroidShareChallenge shareChallenge = new AndroidShareChallenge(this);
|
||||||
initialize(new Klooni(shareChallenge), config);
|
initialize(new Klooni(shareChallenge), config);
|
||||||
|
|
|
@ -18,7 +18,7 @@ buildscript {
|
||||||
allprojects {
|
allprojects {
|
||||||
apply plugin: "eclipse"
|
apply plugin: "eclipse"
|
||||||
|
|
||||||
version = '0.8.4'
|
version = '0.8.6'
|
||||||
ext {
|
ext {
|
||||||
appName = "1010! Klooni"
|
appName = "1010! Klooni"
|
||||||
gdxVersion = '1.9.10'
|
gdxVersion = '1.9.10'
|
||||||
|
|
|
@ -323,7 +323,7 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void deleteSave() {
|
private static void deleteSave() {
|
||||||
final FileHandle handle = Gdx.files.local(SAVE_DAT_FILENAME);
|
final FileHandle handle = Gdx.files.local(SAVE_DAT_FILENAME);
|
||||||
if (handle.exists())
|
if (handle.exists())
|
||||||
handle.delete();
|
handle.delete();
|
||||||
|
|
|
@ -26,7 +26,6 @@ import com.badlogic.gdx.scenes.scene2d.InputListener;
|
||||||
import com.badlogic.gdx.scenes.scene2d.Stage;
|
import com.badlogic.gdx.scenes.scene2d.Stage;
|
||||||
import com.badlogic.gdx.scenes.scene2d.ui.Table;
|
import com.badlogic.gdx.scenes.scene2d.ui.Table;
|
||||||
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
|
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
|
||||||
import com.badlogic.gdx.utils.viewport.FitViewport;
|
|
||||||
|
|
||||||
import dev.lonami.klooni.Klooni;
|
import dev.lonami.klooni.Klooni;
|
||||||
import dev.lonami.klooni.actors.SoftButton;
|
import dev.lonami.klooni.actors.SoftButton;
|
||||||
|
@ -58,7 +57,6 @@ public class MainMenuScreen extends InputListener implements Screen {
|
||||||
Table table = new Table();
|
Table table = new Table();
|
||||||
table.setFillParent(true);
|
table.setFillParent(true);
|
||||||
stage.addActor(table);
|
stage.addActor(table);
|
||||||
stage.setViewport(new FitViewport(Klooni.GAME_WIDTH, Klooni.GAME_HEIGHT));
|
|
||||||
|
|
||||||
// Play button
|
// Play button
|
||||||
final SoftButton playButton = new SoftButton(
|
final SoftButton playButton = new SoftButton(
|
||||||
|
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
@ -1 +1 @@
|
||||||
1010! Klooni
|
1010! Klooni
|
||||||
|
|
Loading…
Reference in a new issue