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
340 Commits 44 Branches 0 Tags
d375c1b4d84511e4e6afe21101aa8dacc7a7f736
Commit Graph

170 Commits

Author SHA1 Message Date
Oskar Wiksten
d375c1b4d8 Added link to Andor's Trail wiki in About/Help. 2012-11-10 16:58:44 +01:00
Oskar Wiksten
42ecd2e47d Minor conversation correction to ailshara_interested_7. (thanks Elyon!) 2012-10-28 10:07:19 +01:00
Oskar Wiksten
57682f83cf Updated lots of spelling and grammar corrections (thanks ctnbeh13!). 2012-10-28 10:06:19 +01:00
Oskar Wiksten
9c95e97a01 Updated German translation for v0.6.12. (thanks Samuel, Phoenixor and Tutar) 2012-10-26 21:01:58 +02:00
Oskar Wiksten
7e3bfac549 Bump version to v0.6.12b2. 2012-10-22 20:06:11 +02:00
Oskar Wiksten
6dd8578b59 Show slot number when prompting for confirmation about overwriting savegames. 2012-10-21 21:13:48 +02:00
Oskar Wiksten
f3e044028f Merge remote-tracking branch 'mchehab/master' into master 
Conflicts:
	AndorsTrail/res/values/authors.xml
	AndorsTrailEdit/AndorsTrailTranslations.js
 2012-10-21 18:43:39 +02:00
Oskar Wiksten
32be42531b Provide setting to disable confirmation dialog box when overwriting a savegame slot. 2012-10-21 18:26:43 +02:00
Oskar Wiksten
852d4c8878 Changed wording on the confirmation dialog box when overwriting a previous savegame. (thanks ctnbeh13) 2012-10-18 06:30:53 +00:00
Oskar Wiksten
c027c72932 Minor fix for centering worldmap on screen. 2012-10-14 13:45:27 +02:00
Oskar Wiksten
67303c3907 Center worldmap on screen. 2012-10-14 13:41:59 +02:00
Oskar Wiksten
4926a69e49 Sell 50 bonemeal potions at a time, instead of 10. 2012-10-14 00:21:15 +02:00
Mauro Carvalho Chehab
2c3ae1767d Add credits to Brazilian Portuguese translation 2012-10-13 17:41:06 -03: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
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
a358fdf344 Provide setting to disable UI animations, such as the combat bar. 2012-10-07 17:25:14 +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
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
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
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
dbff72968a Added Teledus to list of credits. 2012-09-14 21:56:25 +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
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
c2bdcb25f2 Regeneration skill only applies when not adjacent to a monster. 2012-07-30 13:51:58 +02:00
Oskar Wiksten
ed560d3d31 Bugfix: Change places on the quest log rows for buying Lyson marrow, so that the price is stated correctly in the quest log. 2012-07-25 11:32:52 +02:00
Oskar Wiksten
602ae594c1 Lots of spelling corrections (thanks to Rtoo, and major thanks to Elyon!) 2012-07-24 20:56:55 +02:00
Oskar Wiksten
4e472783b2 Several conversation spelling corrections (thanks Mino, Elyon, fiernaq). 2012-07-01 17:58:27 +02:00
Oskar Wiksten
f0be347a15 Spelling correction to Talion's dialogue. (thanks Mino!) 2012-06-16 08:59:05 +02:00
Oskar Wiksten
0e047aaa8b Minor map and spelling corrections. 2012-06-14 21:49:05 +02:00
Oskar Wiksten
4a00996196 Minor spelling correction. 2012-06-09 15:15:48 +02:00
oskar.wiksten
d6ca97deb7 Minor conversation correction (thanks tek!) 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@253 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-06-07 20:15:49 +00:00
oskar.wiksten
c461a65501 Updated German translation (thanks Samuel) (issue 303). 
Fixed issue with icons for actor conditions not being removed after the effect duration has passed (thanks insink71 for finding it!) (issue 304).
Bumbed version number to v0.6.11b2

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@252 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-30 18:58:23 +00:00
oskar.wiksten
4dc8c85a59 Bumped version number to v0.6.11b1. 
Fixed issue with actor conditions not being removed when re-equipping items.
Corrected conversations about Larni living in the northwest (he lives in the north) (thanks Sarumar!)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@251 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-27 21:27:18 +00:00
oskar.wiksten
b184b3404b Updated version number to v0.6.11a1. 
Enabled all resources for v0.6.11.
Fixed issue with splatter effects not being redrawn properly when using "optimized drawing".
Fixed issue with HP bar not being updated by the regeneration skill on maps without monsters.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@248 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-16 15:02:17 +00:00
oskar.wiksten
eb9c7c77c6 Spelling corrections to conversations and questlog for v0.6.11 (thanks ctnbeh13 and Nyktos!) 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@247 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-15 20:29:19 +00:00
oskar.wiksten
d11f4b565c Implemented Kaverin's quest in Remgard, continuation on the Vacor/Unzel story (thanks Nyktos, sdevaney!) 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@245 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-14 18:49:14 +00:00
oskar.wiksten
cf744a7b92 Minor conversation fixes (thanks ctnbeh13 & sdevaney) 
Implemented actual gameplay help in the about section (thanks Nyktos & sdevaney!)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@244 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-13 15:58:46 +00:00
oskar.wiksten
20697136d8 Increased item stats of some v0.6.11 items. 
Updated French translation (issue 298) (thanks thonyc4)
Updated German Tanslation (issue 300) (thanks Samuel, Bomber, caga, buddyCasino)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@243 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-08 20:18:41 +00:00
oskar.wiksten
8ef8f59da2 Implemented 3 new high-level skills (Rejuvenation, Taunt, Concussion). 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@241 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-07 20:31:12 +00:00
oskar.wiksten
328a2e66a6 Added boolean "isPositive" to actor conditions (currently unused though). 
Made "Insect contagion" and "Blistering skin" nonstacking, and increased the magnitude of the effects instead.
Increased critical skill of some monsters.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@240 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-05 13:50:57 +00:00