Compare commits

..

43 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
Zukero
0acd31f090 Merge remote-tracking branch 'googlecode/master' 2014-12-21 12:18:03 +01:00
Zukero
3c6da6a1d7 Merge remote-tracking branch 'origin/master'
Conflicts:
	AndorsTrail/AndroidManifest.xml
	AndorsTrail/project.properties
2014-12-02 00:21:05 +01:00
Zukero
d360a55336 Zoom out enabled on in-game world map.
Update to Android 5.0 (API 21)
2014-12-02 00:17:26 +01:00
Ian Haase
917cd5eb77 Small edit of remgard_villagers1 dialogue 2014-10-29 10:29:22 +01:00
Ian Haase
46ef47e0f7 Fixed up some small issues related to the pitch-black mine and the shortcut to the Blackwater Mountain Settlement. 2014-10-29 10:27:22 +01:00
Ian Haase
98a8f396f8 Small update to the Blackwater Mountain fix. A shortcut from the BWM cabin to the Blackwater Mountain settlement can be opened now. And the Prim mine (pitch-black mine) can be opened up as well. 2014-10-28 19:49:45 +01:00
Ian Haase
417b8a9e1c edit of the tileset "map_broken_1". 2014-10-20 18:09:06 +02:00
Zukero
df07c91af4 Attack cost button now updated when equipment changed mid-fight. Thanks
ace for reporting this.
2014-07-24 22:44:31 +02:00
Zukero
37aa751ce7 Merge pull request #2 from noamik/master
Fixed translations for skill "Hard Hit". Merged from github/noamik/andors-trail/master
2014-07-24 21:48:44 +02:00
Ian Haase
6bd1dcf77d Blackwater mountain fix released.
Now this area can be browsed in the world map!
Most of the maps have been edited and four new maps have been created for aligning purposes.
2014-07-24 15:34:45 +02:00
Michael Noack
bf5439d59e Fixes translations of skill description for "Hard Hit" to reflect changes in 0.7.1.
TODO: pt and pt-rBR are wrong as well and need fixing.
TODO: ru, ja and pl need to be checked by translators and be removed in case of doubt to give future translators a chance to fix the translation.
2014-07-01 19:10:49 +02:00
Michael Noack
0e4ad9e201 Revert "Fixes min damage not getting increased as advertised by skill point of skill "Hard Hit"."
This reverts commit 3615fed2e7.
2014-07-01 11:15:28 +02:00
Michael Noack
3615fed2e7 Fixes min damage not getting increased as advertised by skill point of skill "Hard Hit". 2014-06-30 19:08:23 +02:00
Ian Haase
8109170405 Updated the tileset map_cavewall_4. Now it has got additional wall and corner tiles.
Credits go to rijackson741.
2014-06-20 15:58:13 +02:00
Ian Haase
3bdf530beb Added world map which is updated to v.0.7 2014-06-20 11:13:34 +02:00
Ian Haase
da07968222 Edit of map_cavewall_3.png
Credits go to Moerit!
2014-06-08 14:47:10 +02:00
Ian Haase
d190bce37a Fixed up the two tutorial maps. 2014-06-08 10:38:25 +02:00
Zukero
ebdcc6c603 Added res/raw/actorconditions_debug.json, now loaded instead of the
usual ones when AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ==
true.
2014-05-29 00:57:17 +02:00
Zukero
b40cdd5350 Merge remote-tracking branch 'google/master' 2014-05-29 00:43:37 +02:00
Zukero
0454d6fa1d Fixed version control management errors.... 2014-05-29 00:43:23 +02:00
Zukero
e162066be2 Updated launchpad translations on 2014-05-28 22-16 UTC 2014-05-29 00:32:57 +02:00
Zukero
3d3c882ef0 Updated Polish version of strings.xml and xtrings_about.xml. Thanks to
DanielS.
Google issues #354 & #355
2014-05-29 00:20:22 +02:00
Zukero
869c791e76 Fixed bug when loot bags are on mapchange areas.
You will now be able to pick up a bag when you reach the loot bag
without being transported to a new map.
If you are transported to a new map on a loot bag, you will be offered
to pick up this bag.
2014-05-29 00:19:39 +02:00
Ian Haase
6cedd56453 small update on maps:
-shadow corrections
-other small issues
2014-05-15 13:22:15 +02:00
Zukero
7a02014e1b Merge remote-tracking branch 'google/master'
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
2014-04-23 00:47:59 +02:00
Zukero
624bd19aa9 Updated all "strings.xml" translations to remove obsolete lines.
Made worldmap's named areas translatable through launchpad (.mo files)
2014-04-23 00:33:39 +02:00
Zukero
e920ec958e Included latest launchpad versions (2014-04-06) 2014-04-06 19:17:29 +02:00
Zukero
e390490f23 Updated DE strings.xml 2014-04-06 18:58:11 +02:00
Ian Haase
2240a9e26b added "Replace" object layer to the template file 2014-03-30 20:32:47 +02:00
Zukero
916ab8530d Reminder for later added. 2014-03-04 22:50:21 +01:00
Oskar Wiksten
bd27e5d5ab Bump version to v0.7.2dev 2014-03-02 09:30:40 +01:00
Zukero
7f619d03f8 Return to debug mode.... 2014-02-25 00:04:27 +01:00
Zukero
b43f49fbab Bumped version to v0.7.2dev 2014-02-25 00:03:26 +01:00
Zukero
35e3ad024c Bugfix introduced in previous commits. AP Cost (move, reequip & item
use) should have percentage applied when negative and 100% applied when
positive. Those are the only ones where negative value is a bonus to the
player.
2014-02-24 22:52:52 +01:00
Zukero
46d7bdcd87 Added all the missing stats from second-hand weapon to the dual wield
skill effects.
- DR
- AP Boost (or malus)
- Move cost
- Reequip cost
- Use Item Cost
2014-02-24 22:52:52 +01:00
Zukero
253dda89d7 Added missing \n at EOF... 2014-02-24 22:52:52 +01:00
Zukero
1d0f233292 Dual wield skill bugfixes.
(Seen when using a pair of Rapier of Lifesteal) : Adds boost to Max HP
from off-hand weapon (25% for Dual Wield lv 0, 50% for DW lv 1, and 100%
for DW lv 2)

(Seen when using a non-crit weap in the main hand, and a crit one in the
offhand) : Adds boost to Critical chance from off-hand weapon (25% for
DW0, 50% for DW1, 100% for DW2). Set critical multiplier as max of main
hand weapon's CM and off-hand weapon's CM multiplied by {0.25 for DW0,
0.5 for DW1, 1.0 for DW2).
2014-02-24 22:52:52 +01:00
Oskar Wiksten
0393447bf3 Merge branch 'production' 2014-02-22 17:10:25 +01:00
Ian Haase
95ee5b19d3 Added "map_transition_5" displaying additional shadow transitions 2014-02-20 16:01:50 +01:00
1327 changed files with 253250 additions and 1325735 deletions

View File

@@ -1,68 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="44"
android:versionName="0.7.3"
android:installLocation="auto"
>
<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="28"
/>
<supports-screens
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true"
android:anyDensity="true"
/>
<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"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:description="@string/app_description"
android:allowBackup="true"
android:theme="@style/AndorsTrailTheme_Blue"
>
<activity
android:name=".activity.StartScreenActivity"
android:clearTaskOnLaunch="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/AndorsTrailTheme_Blue.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.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.DisplayWorldMapActivity" />
</application>
</manifest>
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="42"
android:versionName="0.7.2dev"
android:installLocation="auto"
>
<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="21"
/>
<supports-screens
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true"
android:anyDensity="true"
/>
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
/>
<application
android:name=".AndorsTrailApplication"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:description="@string/app_description"
android:allowBackup="true"
>
<activity
android:name=".activity.StartScreenActivity"
android:clearTaskOnLaunch="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.NoBackground"
/>
<activity android:name=".activity.HeroinfoActivity" />
<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="@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>
</manifest>

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

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

@@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-28
target=android-21

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: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 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: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 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

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