OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'worldmap'

Browse Source 
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
This commit is contained in:
Oskar Wiksten
2012-10-07 18:17:53 +02:00
parent 0c585917b5 603d682a82
commit 7aedeae7ba
31 changed files with 1109 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndorsTrail/res/values/strings.xml
View File

@@ -507,5 +507,9 @@
<string name="preferences_ui_category">Interface</string>
<string name="preferences_ui_enable_animations_title">Enable animations</string>
<string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
<string name="menu_button_worldmap">Map</string>
<string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
<string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
<string name="display_worldmap_title">Map</string>
</resources>