Zukero fd21fd62ec Merge branch 'master' into stoutford_tests ...

Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java

2017-01-20 16:56:27 +01: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

Fixed large monster issuem introduced with content reordering, but

2017-01-20 15:07:05 +01:00

src/com/gpl/rpg/AndorsTrail

Merge branch 'master' into stoutford_tests

2017-01-20 16:56:27 +01:00

.classpath

Key Area now use Requirement, instead of QuestProgress

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

.gitignore

Preparation for placing translation files in "assets/"

2013-06-27 20:44:46 +02:00

.project

initial release

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

AndorsTrail.iml

Reduce compiler and code inspection warnings

2013-12-07 13:49:18 +01:00

AndroidManifest.xml

Updated to version code 43.

2016-07-18 18:51:38 +02: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