Compare commits
11 Commits
stoutford_
...
atscript_e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a4cf36c02 | ||
|
|
5886e746b5 | ||
|
|
fc97efdf75 | ||
|
|
0d7ab1a710 | ||
|
|
43e374e5d3 | ||
|
|
05dae1bc74 | ||
|
|
f592207470 | ||
|
|
8a62fb847f | ||
|
|
0028d361c6 | ||
|
|
57a88f437f | ||
|
|
9a8e7d3cb7 |
@@ -18,7 +18,7 @@
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.gpl.rpg.AndorsTrail"
|
||||
android:versionCode="43"
|
||||
android:versionName="0.7.2dev"
|
||||
android:versionCode="40"
|
||||
android:versionName="0.7.1dev"
|
||||
android:installLocation="auto"
|
||||
>
|
||||
<uses-sdk
|
||||
android:minSdkVersion="4"
|
||||
android:targetSdkVersion="21"
|
||||
android:minSdkVersion="4"
|
||||
android:targetSdkVersion="17"
|
||||
/>
|
||||
|
||||
<supports-screens
|
||||
@@ -23,8 +23,6 @@
|
||||
<uses-permission
|
||||
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||
/>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><uses-permission android:name="android.permission.READ_LOGS"/>
|
||||
|
||||
|
||||
<application
|
||||
android:name=".AndorsTrailApplication"
|
||||
@@ -32,7 +30,6 @@
|
||||
android:icon="@drawable/icon"
|
||||
android:description="@string/app_description"
|
||||
android:allowBackup="true"
|
||||
android:theme="@style/AndorsTrailTheme_Blue"
|
||||
>
|
||||
<activity
|
||||
android:name=".activity.StartScreenActivity"
|
||||
@@ -46,22 +43,22 @@
|
||||
<activity
|
||||
android:name=".activity.MainActivity"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
|
||||
android:theme="@style/Theme.NoBackground"
|
||||
/>
|
||||
<activity android:name=".activity.HeroinfoActivity" />
|
||||
<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.MonsterInfoActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.ItemInfoActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.LevelUpActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.ConversationActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.ShopActivity" />
|
||||
<activity android:name=".activity.AboutActivity" />
|
||||
<activity android:name=".activity.LoadingActivity" />
|
||||
<activity android:name=".activity.Preferences" />
|
||||
<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
|
||||
<activity android:name=".activity.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
|
||||
<activity android:name=".activity.DisplayWorldMapActivity" />
|
||||
</application>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Andors Trail\n"
|
||||
"POT-Creation-Date: Sun Nov 10 11:14:56 CET 2013\n"
|
||||
"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: Oskar Wiksten <oskar.wiksten@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
@@ -5020,7 +5020,7 @@ msgid "She's always nagging me about how I should move out of what she considers
|
||||
msgstr ""
|
||||
|
||||
#: conversationlist_elwyl.json:elwyl_7
|
||||
msgid "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sake if YOU moved out."
|
||||
msgid "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sakes if YOU moved out."
|
||||
msgstr ""
|
||||
|
||||
#: conversationlist_elwyl.json:elwyl_8
|
||||
@@ -12066,7 +12066,7 @@ msgid "I have discovered that if you mix some ground up claws from a beast calle
|
||||
msgstr ""
|
||||
|
||||
#: conversationlist_lodar.json:lodar_spo3_0
|
||||
msgid "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven."
|
||||
msgid "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective."
|
||||
msgstr ""
|
||||
|
||||
#: conversationlist_lodar.json:lodar_xul0
|
||||
@@ -26481,7 +26481,7 @@ msgid "Lodar can create a potion of strength if I bring him a dead spider and th
|
||||
msgstr ""
|
||||
|
||||
#: questlist_v070_lodar.json:lodar_pots:43
|
||||
msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster. The Arulir beasts can be found somewhere up in the north, and the claws can apparently be found from creatures that dwell underground and in caves somewhere outside Fallhaven."
|
||||
msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster."
|
||||
msgstr ""
|
||||
|
||||
#: questlist_v070_lodar.json:xulviir
|
||||
@@ -26563,44 +26563,3 @@ msgstr ""
|
||||
#: questlist_v070_misc.json:antifoodp:40
|
||||
msgid "I can bring him more ingredients if I want him to create more antidote potions in the future."
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::blackwater:prim
|
||||
msgid "Prim"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:charwoodh
|
||||
msgid "Charwood"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:crossglen
|
||||
msgid "Crossglen"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:crossroads
|
||||
msgid "Crossroads Guardhouse"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:fallhaven
|
||||
msgid "Fallhaven"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:flagstone
|
||||
msgid "Flagstone Prison"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:fflask
|
||||
msgid "Foaming Flask Tavern"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:loneford
|
||||
msgid "Loneford"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:remgard
|
||||
msgid "Remgard"
|
||||
msgstr ""
|
||||
|
||||
#: worldmap.xml::world1:vilegard
|
||||
msgid "Vilegard"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -8,4 +8,4 @@
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-21
|
||||
target=android-17
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<translate
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromYDelta="0%"
|
||||
android:toYDelta="-100%"
|
||||
android:duration="300"
|
||||
/>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<translate
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:interpolator="@android:anim/accelerate_interpolator"
|
||||
android:fromXDelta="0%"
|
||||
android:toXDelta="100%"
|
||||
android:duration="300"
|
||||
/>
|
||||
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<translate
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromYDelta="-100%"
|
||||
android:toYDelta="0%"
|
||||
android:duration="300"
|
||||
/>
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<translate
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:interpolator="@android:anim/decelerate_interpolator"
|
||||
android:fromXDelta="100%"
|
||||
android:toXDelta="0%"
|
||||
android:duration="300"
|
||||
/>
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="true" android:state_pressed="true" android:color="@color/ui_blue_palette_text_gray_light"/>
|
||||
<item android:state_enabled="true" android:state_checked="true" android:color="@color/ui_blue_palette_text_gray_light"/>
|
||||
<item android:state_enabled="true" android:color="@color/ui_blue_palette_text_gray_mid"/>
|
||||
<item android:state_enabled="false" android:color="@color/ui_blue_palette_text_gray_darker"/>
|
||||
<item android:color="@color/ui_blue_palette_text_gray_mid"/>
|
||||
</selector>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 734 B |
|
Before Width: | Height: | Size: 786 B |
|
Before Width: | Height: | Size: 587 B |
|
Before Width: | Height: | Size: 379 B |
|
Before Width: | Height: | Size: 515 B |
|
Before Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 132 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 16 KiB |
@@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:oneshot="false">
|
||||
|
||||
<item android:drawable="@drawable/loading_anim_00"
|
||||
android:duration="150" />
|
||||
<item android:drawable="@drawable/loading_anim_01"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/loading_anim_02"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/loading_anim_03"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/loading_anim_04"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/loading_anim_05"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/loading_anim_06"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/loading_anim_00"
|
||||
android:duration="150" />
|
||||
|
||||
</animation-list>
|
||||
|
Before Width: | Height: | Size: 538 B |
|
Before Width: | Height: | Size: 602 B |
|
Before Width: | Height: | Size: 607 B |
|
Before Width: | Height: | Size: 604 B |
|
Before Width: | Height: | Size: 516 B |
|
Before Width: | Height: | Size: 511 B |
|
Before Width: | Height: | Size: 567 B |
|
Before Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 187 KiB After Width: | Height: | Size: 185 KiB |
|
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 154 KiB |
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 174 KiB After Width: | Height: | Size: 168 KiB |
|
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 131 KiB |
|
Before Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 57 KiB |
|
Before Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 385 B |
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:tileMode="repeat"
|
||||
android:src="@drawable/ts_sky_gradient_x6"
|
||||
android:antialias="false"
|
||||
android:dither="false"
|
||||
/>
|
||||
|
Before Width: | Height: | Size: 200 B |
@@ -1,28 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:oneshot="false">
|
||||
|
||||
<item android:drawable="@drawable/logo_anim_shine_00"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_01"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_02"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_03"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_04"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_05"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_06"
|
||||
android:duration="180" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_07"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_08"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_09"
|
||||
android:duration="80" />
|
||||
<item android:drawable="@drawable/logo_anim_shine_00"
|
||||
android:duration="5000" />
|
||||
|
||||
</animation-list>
|
||||
|
Before Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 393 B |
|
Before Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 222 B |