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

..

hidecombatbar.xml

Use animations when changing visibility of the combat bar.

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

hidetoolbox.xml

Move toolbox to lower right hand corner, replaces old "toggle quickitems" button.

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

scalebeat.xml

WIP display duration & magnitude on condition icons.

2012-10-07 16:25:36 +02:00

scaledown.xml

WIP display duration & magnitude on condition icons.

2012-10-07 16:25:36 +02:00

scaleup.xml

WIP display duration & magnitude on condition icons.

2012-10-07 16:25:36 +02:00

showcombatbar.xml

Use animations when changing visibility of the combat bar.

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

showtoolbox.xml

Move toolbox to lower right hand corner, replaces old "toggle quickitems" button.

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