Compare commits

..

4 Commits

Author SHA1 Message Date
Zukero
13ec1ea7bd Stoutford added to worldmap, trees re-aligned in wild17. 2016-01-06 19:28:10 +01:00
Zukero
21f6d5c034 Fixed missing reqs in Lodar shortcut convo 2015-06-30 14:09:35 +02:00
Zukero
b8dc5a43c9 Added arulir mountain maps.
Fixed bugs in elythara quests dialogues (Mara & Edwin)
Fixed bugs in waterway2.tmx
2015-01-02 13:30:59 +01:00
Zukero
ba80a8dc9d Added content from Ian:
- Elythara
- Stoutford (maps only)
- Pathway fallhaven
- Shortcut Lodar

Debugged Elythara (Zukero)
Updated worldmap world1 (stoutford & soulpart)
2014-12-23 22:02:16 +01:00
1171 changed files with 149826 additions and 821391 deletions

View File

@@ -3,7 +3,7 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="43"
android:versionCode="42"
android:versionName="0.7.2dev"
android:installLocation="auto"
>
@@ -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>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -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"
/>

View File

@@ -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"
/>

View File

@@ -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"
/>

View File

@@ -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"
/>

View File

@@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 515 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 567 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 B

View File

@@ -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"
/>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

View File

@@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/ui_blue_buttonbar_bg"/>
<item android:drawable="@drawable/ui_blue_buttonbar_frame"/>
</layer-list>

View File

@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
android:state_pressed="false"
android:state_enabled="true"
/>
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_pressed"
android:state_pressed="true"
android:state_enabled="true"
/>
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_unpressed"
android:state_pressed="false"
android:state_enabled="false"
/>
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_pressed"
android:state_pressed="true"
android:state_enabled="false"
/>
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
android:state_enabled="true"
/>
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_unpressed"
android:state_enabled="false"
/>
<item
android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
/>
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 410 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
<item app:single="true" android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
<item app:vertical="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
<item app:vertical="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
<item app:vertical="true" app:first="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
<item app:vertical="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
<item app:vertical="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
<item app:vertical="true" app:last="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
<item app:vertical="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vmid" />
<item app:horizontal="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
<item app:horizontal="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
<item app:horizontal="true" app:first="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
<item app:horizontal="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
<item app:horizontal="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
<item app:horizontal="true" app:last="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
<item app:horizontal="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hmid" />
<item android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Some files were not shown because too many files have changed in this diff Show More