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

..

assets/translation

Translated using Weblate (Czech)

2015-11-14 11:35:09 +01:00

libs

Restored correct "libs/" directory

2015-04-13 17:43:30 +02:00

res

Merge branch 'master' into stoutford_tests

2018-07-08 15:41:51 +02:00

src/com/gpl/rpg/AndorsTrail

Merge branch 'master' into stoutford_tests

2018-05-15 10:55:11 +02:00

.classpath

Key Area now use Requirement, instead of QuestProgress

2013-10-02 18:21:14 +02:00

.gitignore

git integration in Android Studio is ugly

2017-01-04 19:02:58 +02:00

.project

initial release

2010-11-04 21:10:57 +00:00

AndorsTrail.iml

+ new line

2017-01-04 18:26:18 +02:00

AndroidManifest.xml

Progress towards target title screen.

2018-03-09 18:03:19 +01:00

lint.xml

Fix some Android Lint warnings.

2013-06-26 22:26:57 +02:00

project.properties

Zoom out enabled on in-game world map.

2014-12-02 00:17:26 +01:00