OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-20 02:21:11 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
298 Commits 44 Branches 0 Tags
649958de1e51dca6ebcb04d89aa49d4558bb3cd0
Commit Graph

298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Wiksten
649958de1e Always use confirmation dialog box when overwriting another savegame, not only when saving over a different playername. 2012-10-13 23:14:15 +02:00
Oskar Wiksten
738253bef8 Update app icon for mdpi densities (reduce blur). 2012-10-13 23:08:38 +02:00
Oskar Wiksten
2d8e4eefbf Added sign areas to all graves, with a short message describing each tombstone/cross. 2012-10-13 21:39:04 +02:00
Oskar Wiksten
a7f03561ec Toolbox animations should also be affected by the "Enable animations" setting. 2012-10-07 18:24:42 +02:00
Oskar Wiksten
b881b6c15d Merge branch 'traits_refactoring' 2012-10-07 18:19:44 +02:00
Oskar Wiksten
69ca9ec3af Merge branch 'itemcategories' 2012-10-07 18:18:35 +02:00
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
Oskar Wiksten
0c585917b5 Merge branch 'conditions' 2012-10-07 18:13:49 +02:00
Oskar Wiksten
603d682a82 Create a ".nomedia" file in the same directory as the worldmap png files, to prevent gallery apps from picking up the worldmap files. 2012-10-07 17:44:45 +02:00
Oskar Wiksten
a358fdf344 Provide setting to disable UI animations, such as the combat bar. 2012-10-07 17:25:14 +02:00
Oskar Wiksten
a9c4ad6238 Bugfix: only parse maps on worldmap that are actually present as maps. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
1b2bdfa4e0 Merge fixes from branch v0612maps. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
714bf9189e Move toolbox to lower right hand corner, replaces old "toggle quickitems" button. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
8be01002eb Added named areas (towns, taverns) to worldmap. 2012-10-07 16:41:23 +02:00
Oskar Wiksten
18f60e1707 First version of replacing the hero icon with the toolbox drawer. 2012-10-07 16:41:17 +02:00
Oskar Wiksten
4a834765b4 Styled worldmap. Default generated worldmap tilesize changed from 12 to 8 pixels. 2012-10-07 16:41:17 +02:00
Oskar Wiksten
99cf22814d Separate the worldmap into segments, so that only one segment at a time is displayed. This way, even dungeon maps can be displayed. 2012-10-07 16:41:17 +02:00
Oskar Wiksten
51883dbdf5 WIP on displaying an actual worldmap in-game. 2012-10-07 16:40:43 +02:00
Oskar Wiksten
13fc63c07d Automatically save screenshots of maps to sd-card when visiting them. 2012-10-07 16:40:43 +02:00
Oskar Wiksten
534148431e Refactored how item stats are applied. Changed item stats from re-using CombatTraits (which is used on actors) on items, to now instead use more explicit fields on the AbilityModifierTraits object. 2012-10-07 16:39:28 +02:00
Oskar Wiksten
c90d7c4ef0 Use animations when changing visibility of the combat bar. 2012-10-07 16:27:08 +02:00
Oskar Wiksten
bcead230b5 Code cleanup for displaying magnitude on actor condition icons. 2012-10-07 16:27:08 +02:00
Oskar Wiksten
bd0ee9713d WIP display duration & magnitude on condition icons. 2012-10-07 16:25:36 +02:00
Oskar Wiksten
3b6e98781c Added item category "drink" and "rapier" (thanks sdevaney!). Recategorized some items. 2012-10-07 16:10:39 +02:00
Oskar Wiksten
940c159ec3 Changed all two-handed swords into being longswords for the time being (until we have decided what items should be two-handed). 2012-10-07 16:10:39 +02:00
Oskar Wiksten
84fe0ce155 Bugfix: also apply inventory effects to ring in right slot. 2012-10-07 16:10:39 +02:00
Oskar Wiksten
ec86093746 Refactored how item stats are applied to actors, in preparation of fighting style skills. 2012-10-07 16:10:39 +02:00
Oskar Wiksten
bf1fe3bbed Updated content editor so that it may use the new item categories. The categories are loaded from the resource file asynchronously. 2012-10-07 16:10:39 +02:00
Oskar Wiksten
52e1e12cd5 Applied item categorization to translated resource files. 2012-10-07 16:10:27 +02:00
Oskar Wiksten
2bd3016904 Initial work on item categorization. 2012-10-07 16:09:27 +02:00
Oskar Wiksten
e7a91c8eec Updated list of authors. 2012-09-15 09:51:51 +02:00
Oskar Wiksten
f6b1455d5f Bugfix: Make sure that all areas are respawned on the map where the player ends up on after getting killed. 2012-09-15 09:28:25 +02:00
Oskar Wiksten
dbff72968a Added Teledus to list of credits. 2012-09-14 21:56:25 +02:00
Oskar Wiksten
3344d5bd1b Bugfix: make sure that new rounds start at 6s after a combat has ended, and not something less than that. 2012-09-14 21:39:09 +02:00
Oskar Wiksten
b3408a2123 Updated description of rejuvenation skill to indicate that it only affects temporary conditions (thanks Mad P!) 2012-09-14 21:21:00 +02:00
Oskar Wiksten
3ac6a15e6c Updated Russian translation (issues 309, 310, 311, 312) (thanks konstmih!) 2012-09-14 20:52:03 +02:00
Oskar Wiksten
6d1c5ebe9f Updated translation tool to accomodate in-place translation of strings. Major thanks to surgecurrent for the code! 2012-09-13 21:10:13 +02:00
Oskar Wiksten
af5aa14e11 Added Japanese translation! (thanks surgecurrent!) 2012-09-13 20:55:36 +02:00
Oskar Wiksten
b01b16faf4 Updated conversation text for Umar in Fallhaven (issue 316) (thanks bluers0) 2012-09-13 19:11:11 +02:00
Oskar Wiksten
cd5ec26f94 Merge branch 'production' 2012-09-13 19:09:28 +02:00
Oskar Wiksten
05b2f7ee04 Bugfix: Only add conversation phrase to conversation dialog once. (issue 317) (Thanks nether!) 2012-09-13 19:08:05 +02:00
Oskar Wiksten
7c839ef3d7 Updated Italian translation. (thanks Joker!) 2012-09-09 22:09:18 +02:00
Oskar Wiksten
a02ab17f25 Bugfix: respawn all maps after resting. (Thanks Nyktos for finding it!) 2012-09-08 15:46:13 +02:00
Oskar Wiksten
628367f773 Bugfix: do not reset NPCs on current map when resting. 2012-08-29 14:52:45 +00:00
Oskar Wiksten
bb55f075bf Bump version number to v0.6.12a1 2012-08-27 20:00:51 +02:00
Oskar Wiksten
b9bba7c91b Merge updated maps from branch v0612maps. 2012-08-27 19:42:45 +02:00
Oskar Wiksten
04f95ce7f2 Merge branch 'production' 2012-08-07 14:15:07 +02:00
Oskar Wiksten
b47d063c6b Bugfix: do not give out rewards from conversation phrases when returning to the conversation activity. Rewards should only be applied when first visiting a phrase. 2012-08-07 14:14:44 +02:00
Oskar Wiksten
c50b9f43cc Bugfix: reset spawns on maps that have not been visited recently. This will shrink the savegame size to about a fifth of the previous sizes. 2012-08-07 09:55:54 +02:00
Oskar Wiksten
11ba3825ba Bugfix: more fixes to movement of blocked monsters when loading savegames. 2012-08-03 12:30:06 +02:00