OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-17 00:57:02 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
246 Commits 44 Branches 0 Tags
fafcc015e0cc23886bf59e6d83a12ea08130d2c2
Commit Graph

246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Wiksten
fafcc015e0 Persist inventories of vendors in savegame file. Restock merchants when map respawns. 2012-08-01 22:51:02 +02:00
Oskar Wiksten
15bd95b3dc Persist inventories of vendors in savegame. Reset them when the map respawns. 2012-08-01 22:16:32 +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
2f7ed5e1c5 Upped version to v0.7.0dev in-game. 2012-07-30 11:54:42 +02:00
Oskar Wiksten
9c1a9cb590 Upped version to v0.7.0dev. Changed default unarmed attack cost to 4AP. 2012-07-30 11:50:12 +02:00
Oskar Wiksten
b8f55e9213 Merge branch 'production' 2012-07-25 11:33:07 +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
3a91b49cda Merge branch 'production' 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
 2012-07-24 13:48:33 +02:00
Oskar Wiksten
e3d4900887 Bugfix: do not start a new player turn when returning from inventory and AP=0. 2012-07-24 13:43:20 +02:00
Oskar Wiksten
c623d28723 Merge branch 'production' 2012-07-24 10:52:57 +02:00
Oskar Wiksten
61bb0ceb9c Changed some ui icons to being colorindexed png files instead of rgb. (saves some bytes) 2012-07-24 10:33:32 +02:00
Oskar Wiksten
c17b63a9a4 Updated content editor version number 2012-07-10 19:32:09 +02:00
Oskar Wiksten
cbcf97252f Update image icons in left list when icon changes. 2012-07-10 19:30:15 +02:00
Oskar Wiksten
d7064fd589 Added missing file to last checkin 2012-07-10 19:30:15 +02:00
Oskar Wiksten
33dbfca39f WIP on displaying images in lists in AndorsTrailEditor. 2012-07-10 19:30:15 +02:00
Oskar Wiksten
4e472783b2 Several conversation spelling corrections (thanks Mino, Elyon, fiernaq). 2012-07-01 17:58:27 +02:00
Oskar Wiksten
5b23b29111 Merge branch 'production' 2012-06-22 16:54:42 +02:00
Oskar Wiksten
953d0958f4 Enabled debug flags. 2012-06-22 16:52:38 +02:00
Oskar Wiksten
7d4e6e26e0 Trigger actoreffects every combat round. 2012-06-22 09:41:31 +02:00
Oskar Wiksten
af0afa72d2 Added "Connections" layer to world map (thanks TheGleep!) 2012-06-16 19:19:59 +02:00
Oskar Wiksten
f0be347a15 Spelling correction to Talion's dialogue. (thanks Mino!) 2012-06-16 08:59:05 +02:00
Oskar Wiksten
6c9a69220f Updated TMX worldmap according to new maps in v0.6.11. 2012-06-14 21:57:59 +02:00
Oskar Wiksten
0e047aaa8b Minor map and spelling corrections. 2012-06-14 21:49:05 +02:00
Oskar Wiksten
da6aacde5a Bugfix: Populate the combat view correctly when loading games where the player has selected a movement destination in battle. 2012-06-11 20:02:47 +02:00
Oskar Wiksten
4a00996196 Minor spelling correction. 2012-06-09 15:15:48 +02:00
Oskar Wiksten
8700eaec02 Updated version numbers to v0.6.12dev 2012-06-09 12:02:10 +02:00
Oskar Wiksten
4998af1d13 Added additional translated files to the online translation checker. 2012-06-09 10:46:26 +02:00
oskar.wiksten
c592d50fb7 Updated version number to v0.6.11 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@254 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-06-07 20:18:26 +00: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
ea5fb3d791 Removed lots of unncessary logging. 
Added additional safeguards to the code that loads savegames, to make sure that worlds are loaded correctly. Now only one thread may load the world at a time, even if a new LoadingActivity is created, for example by rotating the device.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@250 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-22 20:55:51 +00:00
oskar.wiksten
30bb2aeae4 Make sure that conversation phrases are not focused when using keyboard navigation, since the focus marker interferes with the reply seletion, and makes the text be displayed in the same color as the background. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@249 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-22 17:04:25 +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
b6f307a774 Minor bugfix for r245. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@246 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-14 19:04:11 +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
5bc85fc4f8 Only apply "Rejuvenate" to negative conditions. Do not apply "Rejuvenate" to spiritual conditions. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@242 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-07 20:58:31 +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
oskar.wiksten
cdd944c4ed Updated lots of conversations errors (thanks ctnbeh13!). 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@239 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-02 20:29:56 +00:00
oskar.wiksten
ffd4ffab3e Removed uniqueness from lots of NPCs that were not respawning correctly. (thanks ctnbeh13 for finding it!). 
As a side-effect, this also considerably reduces savegame size.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@238 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-02 20:02:31 +00:00
oskar.wiksten
9cbc501511 Renamed critical hit skills to "Internal bleeding" and "Fracture". 
Fixed bug where the monster attacks would not change state to completed if you enter inventory while the monsters are attacking (this also fixes one long outstanding bug with double monster attacks if you enter inventory).
Updated list of authors.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@237 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-04-29 21:38:58 +00:00
oskar.wiksten
8782a83437 First attempt at displaying quantities on quickbar buttons. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@236 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-04-29 15:47:05 +00:00
oskar.wiksten
c96f0ee26c First attempt at new skills "Attenuation" and "Enervation" (thanks to Nyktos for the ideas) 
Fixed bug with missing icon for dead spiders. (thanks for sdevaney for spotting it)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@235 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-04-28 17:20:26 +00:00
oskar.wiksten
d46597f748 Conversation fixes for Remgard NPCs (thanks ctnbeh13!) 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@234 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-04-28 08:57:42 +00:00
oskar.wiksten
443b8df177 Added missing conversations for signs in v0.6.11. 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@233 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-04-25 23:20:39 +00:00