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

..

abilitymodifierview.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

about.xml

Minor conversation fixes (thanks ctnbeh13 & sdevaney)

2012-05-13 15:58:46 +00:00

actorconditioninfo.xml

Fixed lots of Android lint warnings.

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

basetraitsinfoview.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

bulkselection.xml

Fixed lots of Android lint warnings.

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

combatview.xml

Fixed lots of Android lint warnings.

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

conversation_statement.xml

Fixed lots of Android lint warnings.

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

conversation.xml

Updated to version v0.6.10a3.

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

displayworldmap.xml

Styled worldmap. Default generated worldmap tilesize changed from 12 to 8 pixels.

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

heroinfo_equipped.xml

initial release

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

heroinfo_inventory.xml

Corrections to horizontal alignment issues on Samsung Galaxy S2. (Issue 242)

2011-09-09 19:03:27 +00:00

heroinfo_skill_list.xml

Fixed lots of Android lint warnings.

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

heroinfo_stats.xml

Fixed lots of Android lint warnings.

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

heroinfo_statsicons.xml

Fixed lots of Android lint warnings.

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

heroinfo.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

inventoryitemview.xml

Corrections to horizontal alignment issues on Samsung Galaxy S2. (Issue 242)

2011-09-09 19:03:27 +00:00

itemeffectview_onuse.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

itemeffectview.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

iteminfo.xml

Fixed lots of Android lint warnings.

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

levelup.xml

Fixed lots of Android lint warnings.

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

loadsave.xml

Fixed lots of Android lint warnings.

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

main.xml

Merge branch 'worldmap'

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

monsterencounter.xml

Fixed lots of Android lint warnings.

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

monsterinfo.xml

Fixed lots of Android lint warnings.

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

questlog.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

questlogentry.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

quickitemview.xml

First attempt at displaying quantities on quickbar buttons.

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

rangebar.xml

Fixed lots of Android lint warnings.

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

shop.xml

Fixed lots of Android lint warnings.

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

shopitemview.xml

Fixed lots of Android lint warnings.

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

skill_info_view.xml

Fixed lots of Android lint warnings.

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

skill_listentry_view.xml

Fixed lots of Android lint warnings.

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

startscreen.xml

Changed all "fill_parent" to "match_parent" in layouts.

2011-09-07 18:37:04 +00:00

statusview.xml

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

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

toolboxview.xml

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

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

traitsinfoview.xml

Changes to critical hits - now based on "critical skill" that defines the effective critical chance by a nonlinear formula (sqrt).

2012-03-30 16:38:19 +00:00