Compare commits

..

26 Commits

Author SHA1 Message Date
OMGeeky
e6a1312733 Reorganized some code (1)
To make it more readable & less redundant
2022-06-07 22:58:15 +02:00
OMGeeky
71a8158c53 Removed unsued value
The damage value is never used in the heroKillMonster message
2022-06-07 22:56:59 +02:00
OMGeeky
9919fa6088 changed to auto package
In gradle you can do this to make it easier to switch to a beta version for example
2022-06-07 22:55:17 +02:00
OMGeeky
e62839a7cd updated Gradle & Android version 2022-06-07 21:57:38 +02:00
OMGeeky
32c7de16fe Removed jcentral dependencies
Replaced them with mavenCentral
2022-06-07 20:53:04 +02:00
OMGeeky
f95b8e1c9d Migrate to AndroidX 2022-06-07 19:28:12 +02:00
OMGeeky
d774e762fc Removed .idea folder 2022-06-07 19:27:24 +02:00
OMGeeky
3e3754c485 Delete AndorsTrail.app.iml 2022-06-07 19:19:15 +02:00
OMGeeky
dddf669a78 Update .gitignore 2022-06-07 19:18:46 +02:00
OMGeeky
bd8da6ba0d preserve legacy external storage back in 2022-06-07 19:11:54 +02:00
OMGeeky
1af4881211 Convert to Gradle-Project 2022-06-07 18:38:17 +02:00
Nut.andor
b576bd6a32 map max size enlarged, other it crashes when monsters at Y>33 look for you 2022-05-14 10:59:11 +02:00
Nut.andor
291b5c35e3 Sullengard map changes 2022-05-11 22:55:23 +02:00
Nut.andor
09cdad344a Merge branch 'test_laeroth' 2022-05-11 22:38:03 +02:00
Nut.andor
53d223b8f8 map 2022-05-08 14:33:18 +02:00
Nut.andor
999e338aff Merge branch 'master' into test_laeroth
# Conflicts:
#	AndorsTrail/AndroidManifest.xml
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java
2022-05-08 14:32:51 +02:00
Nut.andor
6284b7b428 debug Map button 2022-04-29 16:04:13 +02:00
Nut.andor
7a6b8ec238 next dev version 2022-04-29 00:43:35 +02:00
Nut.andor
1f852864c8 Merge remote-tracking branch 'AndorsTrailRelease/master' 2022-04-16 17:25:13 +02:00
Nut.andor
26cbaad223 Revert "compression"
This reverts commit a483ab8c12.
2022-04-16 17:23:23 +02:00
Nut.andor
a483ab8c12 compression 2022-04-16 07:46:17 +02:00
Nut.andor
dea20cafe2 Merge remote-tracking branch 'local_AndorsTrailRelease/master' 2022-04-16 07:13:19 +02:00
Nut.andor
9347182487 Merge branch 'master' into test_laeroth (v0.7.15 omi2 fixes)
# Conflicts:
#	AndorsTrail/AndroidManifest.xml
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
2021-12-21 21:03:59 +01:00
Nut.andor
5f0bb1d497 Version nbr 2021-01-31 03:35:30 +01:00
Nut.andor
613e893e80 Merge remote-tracking branch 'AndorsTrailRelease/master' into test_laeroth
# Conflicts:
#	AndorsTrail/AndroidManifest.xml
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
2021-01-31 02:47:01 +01:00
Nut.andor
d6b0823499 version nbr 2021-01-18 07:44:02 +01:00
1800 changed files with 49841 additions and 357100 deletions

1
.gitignore vendored
View File

@@ -1 +0,0 @@
/AndorsTrail/.idea/workspace.xml

View File

@@ -1,30 +1,5 @@
# Android ignores
app/src/main/res
app/src/main/assets
gen/
bin/
target/
local.properties
app/build/intermediates/
build/
debug/
release/
.gradle/
#IntelliJ
.idea/
out/production/
out/test/
*.iws
*.ipr
# Other
.metadata
.svn/
#copied from https://github.com/github/gitignore/blob/main/Gradle.gitignore
.gradle
.idea
**/build/
!src/**/build/
@@ -40,19 +15,8 @@ gradle-app.setting
# Cache of project
.gradletasknamecache
local.properties
# Eclipse Gradle plugin generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
#copied from https://github.com/github/gitignore/blob/main/Gradle.gitignore
/AndorsTrail/.gradle
/AndorsTrail/gradle/wrapper
/AndorsTrail/app/build/
/AndorsTrail/app/debug/
/AndorsTrail/app/release/
.classpath

View File

@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 30
compileSdkVersion 32
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.gpl.rpg.AndorsTrail"
minSdkVersion 14
targetSdkVersion 30
targetSdkVersion 32
}
buildTypes {
@@ -19,29 +19,5 @@ android {
}
dependencies {
implementation 'com.android.support:support-v4:28.0.0'
}
task copyRes(type: Copy) {
description "Copies the res folder to the modules res folder (& renames .tmx to .xml)"
from "${rootDir}/res"
into "${projectDir}/src/main/res"
rename "(.*)\\.tmx", "\$1.xml"
}
task copyTranslation(type: Copy) {
description("Copies the translation files to the modules translations folder")
from "${rootDir}/assets/translation"
into "${projectDir}/src/main/assets/translation"
}
task cleanup(type: Delete) {
description("Deletes the assets/translation and the res folder from the modules folder")
delete "${projectDir}/src/main/res", "${projectDir}/src/main/assets/translation"
}
afterEvaluate {
preBuild.dependsOn project.tasks.copyRes
preBuild.dependsOn project.tasks.copyTranslation
clean.dependsOn project.tasks.cleanup
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
}

View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="66"
android:versionName="0.8.2"
android:versionCode="64"
android:versionName="0.7.17"
android:installLocation="auto"
>
<supports-screens
android:smallScreens="true"
android:normalScreens="true"
@@ -31,7 +31,7 @@
android:requestLegacyExternalStorage="true"
android:hasFragileUserData="true"
android:preserveLegacyExternalStorage="true"
>
tools:targetApi="30">
<activity
android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
android:clearTaskOnLaunch="true"
@@ -62,7 +62,7 @@
<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
android:grantUriPermissions="true"
android:exported="false">

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More