HummusSamurai c42e5b80bd Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories ...

# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java

2017-01-04 19:17:41 +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

a space

2017-01-04 19:13:03 +02:00

src/com/gpl/rpg/AndorsTrail

Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories

2017-01-04 19:17:41 +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

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