Commit Graph

88 Commits

Author SHA1 Message Date
Nut.andor
85c71fb49f content feygard_1 2024-11-15 02:52:06 +01:00
Nut.andor
0684fd8e25 Revert "easy fixes"
This reverts commit 97cabf62b8.
2024-10-19 02:35:04 +02:00
Nut.andor
97cabf62b8 easy fixes 2024-10-19 02:30:40 +02:00
Nut.andor
2b53d200f0 laeroth content 2024-06-16 19:37:13 +02:00
Nut.andor
810a1e810c add new content 2024-04-28 00:44:06 +02:00
Nut.andor
14b9d00796 content exported from ATCS 2023-12-09 22:18:49 +01:00
Nut.andor
979d3c81db duplicated dialogue IDs
Removal of xxx_next_release.json
2023-11-26 02:38:58 +01:00
Nut.andor
c070a39f7c Ratdom content 2023-05-01 02:00:00 +02:00
Nut.andor
311accfdd3 prep for beta 2023-01-24 20:21:38 +01:00
Nut.andor
7b5fc79375 fixes from beta 2022-11-09 07:30:19 +01:00
Nut.andor
83724ba408 haunted content 2022-11-05 02:03:27 +01:00
Nut.andor
a71dcc13a3 content 0.8.2 2022-10-17 23:06:34 +02:00
Nut.andor
f46d2aedbf content v082 (Sullengard fixes) 2022-10-08 02:56:10 +02:00
Nut.andor
09ff14bd14 content sullengard 2022-09-27 21:54:13 +02:00
Nut.andor
d879629e4a Revert to next prod version 2022-09-26 22:41:03 +02:00
Nut.andor
10ebaf925f content sullengard 2022-09-26 00:43:37 +02:00
Nut.andor
1cec98249b Migration to actual AndroidStudio version
Copy  ...\AndorsTrailRelease\andors-trail\AndorsTrail  to  a temporary directory, then delete the content except the .git directory.   (C:\AT\AndorsTrailRelease_before_Mig_20220925)

Open Android Studio, any project
New >> Import project

> Import Project, select the AndorsTrail folder from the temporary location
	C:\AT\AndorsTrailRelease_before_Mig_20220925\andors-trail\AndorsTrail
  Destination: C:\AT\AndorsTrailRelease\andors-trail\AndorsTrail

Click next a few times.
It then shows some error about not finding build tools. Below it there should be the option to 'Add google Maven reposiroty and sync project'. Click that option and then 'Do Refactor' (Bottom Left).

In the newly created file 'app/build.gradle'
In line 4 change the compileSdkVersion to 30 (or higher?)
In line 9 change the minSdkVersion to 14 instead of 4
In line 22 change the version from '29.+' to '28.0.0' and the compile at the beginning to implementation
Then Click 'Sync Project with Gradle Files' (icon in top right) that should no longer give errors.
2022-09-25 13:16:57 +02:00
Nut.andor
dba2900213 new content (bug fixes) 2022-04-15 11:58:33 +02:00
Nut.andor
2334a91a5a Potsc + export (loadressource) 2022-02-15 23:58:11 +01:00
Nut.andor
aaac6ae3b5 close and merge to release master 2022-02-15 23:42:45 +01:00
Nut.andor
16f648ebfa new translations + POT 2021-12-12 15:17:49 +01:00
Nut.andor
535e6895ba version v0.7.15 #62 2021-12-12 14:55:03 +01:00
Nut.andor
c25089d368 exported by ATCS 2021-11-01 13:11:43 +01:00
Nut.andor
2b533f9617 fungi_panic 2021-01-24 22:44:06 +01:00
Nut
486feeb4f8 building 0.7.12 2020-09-20 23:10:03 +02:00
Nut
e5ba35372b Revert "Translations"
This reverts commit 5719e5be47.
2020-06-06 16:02:53 +02:00
Nut
5719e5be47 Translations 2020-06-06 15:44:43 +02:00
Nut
59a2c0ea45 building 0.7.11 2020-06-06 00:31:23 +02:00
Nut
c5347ffed0 version change to 0.7.11 2020-05-12 00:34:32 +02:00
Nut
2a10a2dfd0 Building v079 from ATCS v079 2020-02-23 16:30:49 +01:00
Nut
d2ccb9b118 v078 (yet without translations) 2020-01-09 23:23:21 +01:00
Nut
46af6d3c4c Revert "v078"
This reverts commit 4cff325789.
2020-01-09 22:08:02 +01:00
Nut
4cff325789 v078 2020-01-09 00:25:33 +01:00
Nut
93ba6ee4ac release build v0.7.6.1 before compression 2019-10-20 23:18:02 +02:00
Nut
837e54c33e preparation for release build 2019-10-03 21:43:25 +02:00
Nut
18099e016b merge of 0_7_6_ATCS and omicronrg9 2019-06-20 19:12:47 +02:00
Peter Anderson
65d2a73efa Removed 'guynmart_main_3' duplicate 2019-03-15 22:15:05 +02:00
Zukero
1df0534dc8 Merged ATCS project bugfix_0_7_4 (from rijackson's github repo) 2019-01-08 15:25:47 +01:00
Rijackson
7b6ff3e22f Removed map fields11a.tmx, which was causing conflicts with existing map fields11.tmx. fields11.tmx has been replaced with fields11a.tmx in bugfix project. 2018-08-04 18:09:50 -04:00
Zukero
4ab509aead ATCS Project stoutford_combined finally integrated! 2018-07-08 15:54:47 +02:00
Zukero
ce0e1871ab Merge branch 'master' into stoutford_tests
# Conflicts:
#	AndorsTrail/res/raw/conversationlist_fallhaven_south.json
#	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
#	AndorsTrail/res/raw/questlist_pathway_fallhaven.json
2018-07-08 15:41:51 +02:00
Rijackson
60e9fa7073 Initial Teksin commit 2018-06-13 18:20:49 -04:00
NutAndor
e00ec840a1 Merge pull request #5 from Zukero/master
merge zukeros master into nuts stoutford_tests
2018-06-07 23:04:45 +02:00
Nut
28ddc13217 adds to guynmart_merge
I forgot loadresources.xml :(
and added me to authors.xml
2018-06-04 01:22:59 +02:00
Nut
9992948740 Guynmart merge
next try
2018-06-03 15:39:33 +02:00
Zukero
520074bd12 Merge branch 'master' into stoutford_tests
Conflicts:
	AndorsTrail/res/drawable/map_fence_4.png
	AndorsTrail/res/values/loadresources.xml
2018-05-15 10:55:11 +02:00
Rijackson
e29bc07150 The graveyard and waterwaycave material from Gulisano and me. 2018-04-23 18:18:57 -04:00
Zukero
98ac4ba6ef Merge branch 'master' into stoutford_tests 2017-08-18 11:54:41 +02:00
Carceris Magister
101d722ae6 Fixed dangling reference in Mikhail's conversation list. 2017-08-17 09:16:36 -04:00
Zukero
45d3ab9fb5 Merge branch 'master' into stoutford_tests
Conflicts:
	AndorsTrail/res/values/loadresources.xml
2017-07-25 21:33:55 +02:00