Commit Graph

4253 Commits

Author SHA1 Message Date
Gonk
eaca079fe2 Made proceedToPhrase non recursive too allow longer chains of dialogues 2020-11-01 18:17:33 +01:00
Gonk
1b105083d4 Merge branch 'test_fungi' of https://github.com/NutAndor/andors-trail into nut_test_fungi 2020-10-23 20:42:56 +02:00
Gonk
ea03067b2b Damage modifier when dual wielding now depends on the dual wield skill 2020-10-23 20:42:29 +02:00
Nut
3d5c6276c0 probably version 57 2020-10-15 14:03:57 +02:00
Nut
97feb1117d boss_fungi 2020-10-04 22:00:15 +02:00
Gonk
3423abc6b0 Increased API level to 29 so we can update AT after november 2020
Use requestLegacyExternalStorage flag to opt out of scoped storage
2020-10-03 20:13:52 +02:00
Nut
a695647175 translation fixes 2020-10-03 17:54:19 +02:00
Gonk
94f5296067 Merge branch 'queststepsort' into nut_test_fungi 2020-10-01 22:59:07 +02:00
Gonk
42fcbecf7c Merge remote-tracking branch 'atsymboldot/no-tapping-out-of-loot' into nut_test_fungi 2020-10-01 22:51:00 +02:00
Gonk
a8e6d27983 Merge remote-tracking branch 'atsymboldot/combat-log-improvements' into nut_test_fungi
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
2020-10-01 22:49:10 +02:00
Gonk
584c8885f3 Merge remote-tracking branch 'jasptravis/travis' into nut_test_fungi
Omitted PO file change

# Conflicts:
#	AndorsTrail/assets/translation/de.po
2020-10-01 22:37:49 +02:00
Nut
f470cbd462 Basics changes for test fungi_panic 2020-09-30 00:10:38 +02:00
Nut
22999d5632 Merge branch 'master' into test_fungi
# Conflicts:
#	AndorsTrail/res/values/authors.xml
2020-09-30 00:04:57 +02:00
Nut
ff7c38bc35 Merge remote-tracking branch 'andors-trail/master' 2020-09-29 23:46:49 +02:00
Nut
a54258ffb2 It wasn't necessary to increment the int. release 2020-09-29 23:27:19 +02:00
Gonk
9ab74c881d Queststeps in the quest log are now sorted in chronological order.
Until now they were sorted by step id.
2020-09-28 21:19:51 +02:00
Nut
ba0a2562b2 Correct count of maps+quests again: up to 555 maps and 78 quests 2020-09-27 19:48:43 +02:00
Nut
b3f62f72ad Increment internal release number to 56
Correct count of maps+quests
2020-09-27 17:12:03 +02:00
Chriz76
e24cfea200 Google policy violation 2020-09-27 13:27:01 +02:00
Chriz76
ca842f451c V0.7.12 2020-09-26 12:12:16 +02:00
Chriz76
e20d962b32 V0.7.12 2020-09-26 12:11:27 +02:00
Chriz76
0238118a36 Use the US version 2020-09-26 12:10:51 +02:00
Chriz76
2899af86d6 Use the US version 2020-09-26 12:10:29 +02:00
Nut
3e6cf167ad Merge pull request #44 from AndorsTrailRelease/master
update to v0.7.12
2020-09-26 07:23:01 +02:00
Nut
13bb9ab322 Merge remote-tracking branch 'hosted.weblate/master' 2020-09-23 00:29:55 +02:00
Nut
5a34e1f816 fix Oromir 2020-09-23 00:15:34 +02:00
Elytra Wixzo
0d7835338b Translated using Weblate (Tagalog)
Currently translated at 87.2% (491 of 563 strings)
2020-09-22 22:06:24 +02:00
Oğuz Ersen
a3ba57dc7f Translated using Weblate (Turkish)
Currently translated at 100.0% (563 of 563 strings)
2020-09-22 22:06:22 +02:00
Mingun
0a810549b3 Translated using Weblate (Russian)
Currently translated at 100.0% (563 of 563 strings)
2020-09-22 22:06:22 +02:00
Nut
cdacc346ed Actualize PO files 2020-09-21 00:12:41 +02:00
Nut
d4da74d82d Actualize PO files 2020-09-20 23:42:07 +02:00
Nut
b5e2f3157c Merge pull request #26 from NutAndor/test_brimhaven
Test brimhaven
2020-09-20 23:17:53 +02:00
Nut
486feeb4f8 building 0.7.12 2020-09-20 23:10:03 +02:00
Nut
a63150406a fix %1$d in -TL 2020-09-20 19:30:05 +02:00
Nut
cfcfb84038 Merge remote-tracking branch 'hosted.weblate/master' 2020-09-20 19:22:06 +02:00
Elytra Wixzo
df7bd21b9d Translated using Weblate (Tagalog)
Currently translated at 65.5% (369 of 563 strings)
2020-09-20 19:10:08 +02:00
Oğuz Ersen
d4a28f7ff3 Translated using Weblate (Turkish)
Currently translated at 100.0% (563 of 563 strings)
2020-09-20 19:10:08 +02:00
Oğuz Ersen
2ca51a5e84 Translated using Weblate (Turkish)
Currently translated at 25.4% (2864 of 11250 strings)
2020-09-20 19:10:06 +02:00
mustafa kodaz
591a3aa6b3 Translated using Weblate (Turkish)
Currently translated at 25.4% (2864 of 11250 strings)
2020-09-20 19:10:06 +02:00
ssantos
42bc6d9422 Translated using Weblate (Portuguese)
Currently translated at 100.0% (11250 of 11250 strings)
2020-09-20 19:10:04 +02:00
Meiru
1ae44fe088 Translated using Weblate (Japanese)
Currently translated at 41.9% (4719 of 11250 strings)
2020-09-20 19:10:02 +02:00
Nathan Watson
61966ab7e2 Prevent stray taps from accidentally cancelling loot windows and the permadeath "Game Over" screen 2020-09-20 09:29:37 -07:00
Nut
5fa1f68f93 translators again 2020-09-20 09:11:33 +02:00
Chriz76
a0a47e443d Update authors.xml 2020-09-20 09:07:06 +02:00
Chriz76
9761f3d9c8 Update authors.xml 2020-09-20 01:14:36 +02:00
Chriz76
8dc9a123cd Update authors.xml
Added Nathan Watson
2020-09-20 00:56:08 +02:00
mustafa kodaz
234acd430d Translated using Weblate (Turkish)
Currently translated at 95.5% (538 of 563 strings)
2020-09-19 19:33:10 +02:00
Elytra Wixzo
a8a2b6c01f Translated using Weblate (Tagalog)
Currently translated at 61.4% (346 of 563 strings)
2020-09-19 16:41:19 +02:00
Meiru
c63c0cc0c3 Translated using Weblate (Japanese)
Currently translated at 41.6% (4690 of 11250 strings)
2020-09-19 16:41:18 +02:00
Elytra Wixzo
7bb9e0c572 Translated using Weblate (Tagalog)
Currently translated at 60.5% (341 of 563 strings)
2020-09-19 05:17:09 +02:00