3171 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Oskar Wiksten	c5d8ca7b07	Bugfix: do not move monsters around unnecessarily when loading savegames.	2012-08-03 12:24:39 +02:00
Oskar Wiksten	f21b0c85b9	Provide whole stacktrace in log when a savegame fails to load.	2012-08-02 13:44:38 +02:00
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