Skip to content

Commit 30f1ce8

Browse files
authored
Merge pull request #45 from Crazy-Marvin/development
Halma 6.0
2 parents d9efdd4 + 04a4517 commit 30f1ce8

File tree

301 files changed

+1332
-3141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+1332
-3141
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.properties encoding=utf-8

.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/CONTACT.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Welcome to the Halma community.
2+
3+
Within desired privacy, accept and grant criticism constructively.
4+
5+
Finding yourself unable to do so, e-mail marvin@poopjournal.rocks answered by Crazy Marvin, the project maintainer.

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "gradle" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "monthly"

.gitignore

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ gwt-unitCache/
1717
www-test/
1818
.gwt-tmp/
1919

20-
## Android Studio and Intellij and Android in general
21-
/android/libs/armeabi/
20+
## Android Studio and Intellij
2221
/android/libs/armeabi-v7a/
2322
/android/libs/arm64-v8a/
2423
/android/libs/x86/
@@ -41,7 +40,6 @@ com_crashlytics_export_strings.xml
4140
/desktop/bin/
4241
/html/bin/
4342
/ios/bin/
44-
/ios-moe/bin/
4543
*.tmp
4644
*.bak
4745
*.swp
@@ -59,43 +57,42 @@ com_crashlytics_export_strings.xml
5957
/desktop/nbproject/private/
6058
/html/nbproject/private/
6159
/ios/nbproject/private/
62-
/ios-moe/nbproject/private/
6360

6461
/build/
6562
/android/build/
6663
/core/build/
6764
/desktop/build/
6865
/html/build/
6966
/ios/build/
70-
/ios-moe/build/
7167

7268
/nbbuild/
7369
/android/nbbuild/
7470
/core/nbbuild/
7571
/desktop/nbbuild/
7672
/html/nbbuild/
7773
/ios/nbbuild/
78-
/ios-moe/nbbuild/
7974

8075
/dist/
8176
/android/dist/
8277
/core/dist/
8378
/desktop/dist/
8479
/html/dist/
8580
/ios/dist/
86-
/ios-moe/dist/
8781

8882
/nbdist/
8983
/android/nbdist/
9084
/core/nbdist/
9185
/desktop/nbdist/
9286
/html/nbdist/
9387
/ios/nbdist/
94-
/ios-moe/nbdist/
9588

9689
nbactions.xml
9790
nb-configuration.xml
9891

92+
## Visual Studio Code
93+
94+
.vscode/
95+
9996
## Gradle
10097

10198
/local.properties
@@ -107,7 +104,6 @@ gradle-app.setting
107104
/desktop/build/
108105
/html/build/
109106
/ios/build/
110-
/ios-moe/build/
111107

112108
## OS Specific
113109
.DS_Store
@@ -120,8 +116,3 @@ Thumbs.db
120116
/ios/xcode/native/
121117
/ios/IOSLauncher.app
122118
/ios/IOSLauncher.app.dSYM
123-
124-
/ios-moe/xcode/*.xcodeproj/*
125-
!/ios-moe/xcode/*.xcodeproj/xcshareddata
126-
!/ios-moe/xcode/*.xcodeproj/project.pbxproj
127-
/ios-moe/xcode/native/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/1bc4318b13c04d6d994fca383e9a1bee)](https://www.codacy.com/gh/Crazy-Marvin/Halma/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Crazy-Marvin/Halma&utm_campaign=Badge_Grade)
99
[![codecov](https://codecov.io/gh/Crazy-Marvin/Halma/branch/master/graph/badge.svg?token=sErYkIqHmc)](https://codecov.io/gh/Crazy-Marvin/Halma)
1010
[![Hosted Weblate](https://hosted.weblate.org/widgets/halma/-/svg-badge.svg)](https://hosted.weblate.org/engage/halma/)
11-
![Known Vulnerabilities](https://snyk.io/test/github/Crazy-Marvin/Halma/badge.svg)
11+
[![Known Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/Crazy-Marvin/Halma)](https://snyk.io/)
1212
[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19)
1313
[![F-Droid](https://img.shields.io/f-droid/v/rocks.poopjournal.halma.svg)](https://f-droid.org/en/packages/rocks.poopjournal.halma/)
1414
[![Google Play](https://badgen.net/badge/icon/googleplay?icon=googleplay&label)](https://play.google.com/store/apps/details?id=rocks.poopjournal.halma)

android/AndroidManifest.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="rocks.poopjournal.halma" >
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="app.halma">
5+
6+
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
47

58
<application
69
android:allowBackup="true"
7-
android:icon="@mipmap/icon_launcher"
10+
android:fullBackupContent="true"
11+
android:icon="@mipmap/ic_launcher"
812
android:isGame="true"
913
android:appCategory="game"
1014
android:label="@string/app_name"
11-
android:theme="@style/GdxTheme" >
15+
tools:ignore="UnusedAttribute">
1216
<activity
13-
android:name="rocks.poopjournal.halma.AndroidLauncher"
17+
android:name="app.halma.AndroidLauncher"
1418
android:label="@string/app_name"
1519
android:screenOrientation="landscape"
16-
android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout">
20+
android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout"
21+
android:exported="true">
1722
<intent-filter>
1823
<action android:name="android.intent.action.MAIN" />
1924
<category android:name="android.intent.category.LAUNCHER" />

android/assets/META-INF/MANIFEST.MF

Lines changed: 0 additions & 3 deletions
This file was deleted.

android/assets/badlogic.jpg

-66.9 KB
Binary file not shown.

android/assets/halma.png

-247 KB
Binary file not shown.

0 commit comments

Comments
 (0)