Oskar Wiksten 7aedeae7ba Merge branch 'worldmap' ...

Conflicts:
	AndorsTrail/res/values/strings.xml
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java

2012-10-07 18:17:53 +02:00

..

res

Merge branch 'worldmap'

2012-10-07 18:17:53 +02:00

src/com/gpl/rpg/AndorsTrail

Merge branch 'worldmap'

2012-10-07 18:17:53 +02:00

.classpath

Fixed lots of Android lint warnings.

2012-03-24 11:28:14 +00:00

.gitignore

Minor spelling correction.

2012-06-09 15:15:48 +02:00

.project

initial release

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

.svnignore

Updated quest text for "Feygard errands" (thanks fiernaq)

2012-04-17 20:42:42 +00:00

AndroidManifest.xml

WIP on displaying an actual worldmap in-game.

2012-10-07 16:40:43 +02:00

default.properties

Updated to support Android 2.3.3 (API version 10)

2011-03-09 21:17:40 +00:00

lint.xml

Fixed lots of Android lint warnings.

2012-03-24 11:28:14 +00:00

project.properties

Bumped version to v0.6.11dev.

2011-10-30 11:56:46 +00:00