Oskar Wiksten f3e044028f Merge remote-tracking branch 'mchehab/master' into master ...

Conflicts:
	AndorsTrail/res/values/authors.xml
	AndorsTrailEdit/AndorsTrailTranslations.js

2012-10-21 18:43:39 +02:00

..

anim

Merge branch 'worldmap'

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

drawable

First version of replacing the hero icon with the toolbox drawer.

2012-10-07 16:41:17 +02:00

drawable-hdpi

Virtual D-pad (thanks to Samuel)

2011-07-08 12:31:21 +00:00

drawable-ldpi

Virtual D-pad (thanks to Samuel)

2011-07-08 12:31:21 +00:00

drawable-mdpi

Update app icon for mdpi densities (reduce blur).

2012-10-13 23:08:38 +02:00

layout

Merge branch 'traits_refactoring'

2012-10-07 18:19:44 +02:00

layout-land

First attempt at displaying quantities on quickbar buttons.

2012-04-29 15:47:05 +00:00

menu

Initial work on item categorization.

2012-10-07 16:09:27 +02:00

values

Merge remote-tracking branch 'mchehab/master' into master

2012-10-21 18:43:39 +02:00

values-de

Added item category "drink" and "rapier" (thanks sdevaney!). Recategorized some items.

2012-10-07 16:10:39 +02:00

values-fr

Added item category "drink" and "rapier" (thanks sdevaney!). Recategorized some items.

2012-10-07 16:10:39 +02:00

values-it

Added item category "drink" and "rapier" (thanks sdevaney!). Recategorized some items.

2012-10-07 16:10:39 +02:00

values-iw

Fixed tileset naming on waterway- and pwcave maps.

2011-10-07 20:52:12 +00:00

values-ja

Added Japanese translation! (thanks surgecurrent!)

2012-09-13 20:55:36 +02:00

values-pt

Translate strings.xml to pt-BR

2012-10-13 16:12:12 -03:00

values-pt-rBR

Translate a few more monsters

2012-10-20 23:19:19 -03:00

values-ru

Added item category "drink" and "rapier" (thanks sdevaney!). Recategorized some items.

2012-10-07 16:10:39 +02:00

values-v10

Updated to version v0.6.10a3.

2011-10-09 11:14:38 +00:00

xml

Provide setting to disable confirmation dialog box when overwriting a savegame slot.

2012-10-21 18:26:43 +02:00