Oskar Wiksten
8a492fed92
Merge branch 'translate_gettext' into v070
2013-06-27 20:44:58 +02:00
Oskar Wiksten
adee44524f
Fix Android Lint warnings.
2013-06-27 20:44:46 +02:00
Oskar Wiksten
96bc4ec59c
Preparation for placing translation files in "assets/"
2013-06-27 20:44:46 +02:00
Oskar Wiksten
7672827d1f
Update visibility of methods used in unit tests.
2013-06-27 20:44:46 +02:00
Oskar Wiksten
a74bef815c
Updated translation MO-file parser to read the MO filename from strings.xml.
2013-06-27 20:44:46 +02:00
Oskar Wiksten
48d315300e
Parse translations from MO files.
2013-06-27 20:44:46 +02:00
Oskar Wiksten
c33ec5133f
Merge branch 'pathfinder' into v070
2013-06-27 20:42:58 +02:00
Oskar Wiksten
87fa73a2a0
Fix merge issues after rebase.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
048ea6b356
Do not wait for combat turns when monsters want to move, but cannot find a path.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
bc52d9b7af
Redraw tiles when monsters move in combat.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
9b66c604e6
Make monster aggression a property per monster type (instead of being derived from the monster class)
...
* Add property movementAggressionType on MonsterType, that gets read when deserializing monster types from json.
* Add dropdown in monster editor in content editor, to set the monster aggression type.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
7476bb3432
POC monsters moving during combat - Fix merge issues from master.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
578c4e55f2
Make monster movement aggression based on monster type.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
d84d6e6c12
First try at a Pathfinder for moving monsters towards the player based on different aggression types.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
93c8a098bd
Merge branch 'fightstyles' into v070
2013-06-27 20:42:26 +02:00
Oskar Wiksten
9d1720e19d
Change "fighting bare hands" to "fighting unarmed".
2013-06-27 20:40:55 +02:00
Oskar Wiksten
61cbd29878
Fightstyles: Fix merge issues from master.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
8b6aafc5bd
Added better descriptions for the new skills.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
dfff586d7d
Better descriptions for some of the new skills.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
0c376442bb
Armor proficiencies should not affect items with negative stats.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
83af64b4a3
Fixed issue with critical multipliers from main-hand weapons.
...
Fixed issues with weapon proficiency being applied after dual wielding bonuses (should be before dual-wielding bonuses)
Fixed issues with negative AC in offhand weapons not being taken into account when dual-wielding.
Equipping a regular weapon should replace two-hand weapon.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
1bd20564fd
Added weapon proficiency & fighting style skills.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
e560bba808
Bugfix: Store all visited maps in savegame
...
* Required for keeping the "lastSeenLayoutHash" between savegames.
2013-06-27 20:24:42 +02:00
Oskar Wiksten
98caa3295e
Fix some Android Lint warnings.
2013-06-26 22:26:57 +02:00
Oskar Wiksten
8517fa3615
Update list of authors.
2013-06-26 20:17:33 +02:00
Oskar Wiksten
98d2c89fed
Minor map fixes.
2013-06-25 01:02:37 +02:00
Oskar Wiksten
4d80f1b41d
Minor refactoring: Move code that happens after loading a game into Savegames.onWorldLoaded.
2013-06-24 21:08:29 +02:00
Oskar Wiksten
3688cb0914
Minor fixes to dynamic map tiles.
2013-06-22 17:48:02 +02:00
Oskar Wiksten
4a97466d51
Merge branch 'dynamic-layeredtilemap'
2013-06-22 16:31:48 +02:00
Oskar Wiksten
95c4ba9396
Only store first 4 bytes of map hashes (instead of the full 16byte md5sum)
...
* To keep savegame sizes smaller.
2013-06-22 16:31:39 +02:00
Oskar Wiksten
6c03b40262
Updated template.tmx - added "Replace" layer.
2013-06-22 16:21:25 +02:00
Oskar Wiksten
e65492c837
Worldmap: PNG file names now contain the hash of the tiles that the map contains.
...
* This way, when a map has some replacements applied, the hash will change, thus making it possible to have several different PNG files for each map, each with its own combination of replacements.
* Only display maps on worldmap that are visited by the current player.
* Update worldmap after replacements have been applied.
2013-06-22 16:21:25 +02:00
Oskar Wiksten
c34614f09b
First attempt at dynamic map tiles that change based on quest progress.
2013-06-22 16:21:25 +02:00
Oskar Wiksten
0a9da53930
Revamped looks of crossglen.tmx
2013-06-18 19:59:35 +02:00
Oskar Wiksten
3051d904bd
Merge branch 'move-iswalkable-to-layermap'
2013-06-16 10:44:34 +02:00
Oskar Wiksten
f861529564
When entering map, move ground loot bags on unwalkable tiles.
2013-06-16 10:43:56 +02:00
Oskar Wiksten
b455bf2dbe
Speed up game start by not loading map layers
...
* This can be done by making the assumption that all tiles from the maps tilesets will be used.
2013-06-16 10:43:56 +02:00
Oskar Wiksten
cab1185f14
Move isWalkable from PredefinedMap to LayeredTileMap
...
* In effect, this will lower the amount of memory being used while running the game.
* The walkable bitmap will now be loaded at the same time that the image tiles are loaded for maps, and not when starting the game.
2013-06-16 10:43:56 +02:00
Oskar Wiksten
25fe0441c6
Minor map fixes
2013-06-15 20:18:41 +02:00
Oskar Wiksten
4148ff46be
Moved spawn areas away from map edges and mapchange areas.
2013-06-15 11:26:53 +02:00
Oskar Wiksten
fac19a1561
Remove "respawn: false" from all tmx files (it's replaced by a property on the monstertype instead).
2013-06-15 11:25:44 +02:00
Oskar Wiksten
f9979f32dc
Show quest progress updates in conversation.
2013-06-15 10:16:27 +02:00
Oskar Wiksten
9b7c5207d0
Add toolbox button for displaying combat log.
2013-06-15 09:40:53 +02:00
Oskar Wiksten
52cec01ed2
Remove in-game menu.
...
* Move Save from menu to toolbox
* Move preferences to startscreen
* Remove exit on startscreen
2013-06-14 21:41:49 +02:00
Oskar Wiksten
540ac0e87f
Correct sizes on map tiles map_wall_2 and map_wall_3.
2013-06-12 00:18:08 +02:00
Oskar Wiksten
01e42134e2
Content editor: Do not default items to type "other".
2013-06-05 23:25:04 +02:00
Oskar Wiksten
21fe350280
Better error messages when reading malformed conversations.
2013-06-05 22:12:39 +02:00
Oskar Wiksten
a8b0d5dc49
Add monsters_demon2 to resourceloader.
2013-06-05 22:12:02 +02:00
Oskar Wiksten
82d8ee6280
Content editor: Fix missing reward type when importing conversations.
2013-06-04 20:11:25 +02:00
Oskar Wiksten
3069ab4819
Add bash script for starting editor locally.
2013-06-02 19:59:08 +02:00
