Commit Graph

756 Commits

Author SHA1 Message Date
Oskar Wiksten
bd27e5d5ab Bump version to v0.7.2dev 2014-03-02 09:30:40 +01:00
Oskar Wiksten
0393447bf3 Merge branch 'production' 2014-02-22 17:10:25 +01:00
Oskar Wiksten
57ba9dfa69 Bump version to v0.7.1 (versioncode 42) 2014-02-22 16:57:58 +01:00
Ian Haase
95ee5b19d3 Added "map_transition_5" displaying additional shadow transitions 2014-02-20 16:01:50 +01:00
Oskar Wiksten
8d4adab240 Refactor: Remove unsued 'flags' param when writing savegames
* Remove unsued 'flags' parameter in methods for storing savegames.
* Refactor static constructors when reading objects from savegames so that the ctors are named "newFromParcel", to differentiate them from "readFromParcel".
2013-12-08 09:36:02 +01:00
Oskar Wiksten
9e799962e9 Reduce compiler and code inspection warnings
* Replace single-char strings with chars
* Reduce visibility where applicable
* Remove unused method parameters
2013-12-07 13:49:18 +01:00
Oskar Wiksten
29973a74dd Merge pull request #17 from TodorBalabanov/parallelcoords
Replace coords with xCoords and yCoords.
2013-12-03 12:29:05 -08:00
Todor Balabanov
8e98805a93 Replace coords with xCoords and yCoords.
One parallel array more will help to escape packing and unpacking
coordinates as integer values.
2013-12-03 11:57:30 +02:00
Oskar Wiksten
72a229a78a Code cleanup: intellij->rightclick->optimize imports 2013-11-30 11:05:04 +01:00
Oskar Wiksten
aefa578004 Merge pull request #13 from TodorBalabanov/master
We avoid unnecessary boxing of the Integer values.
2013-11-24 06:03:47 -08:00
Todor Balabanov
4b75f06987 We avoid unnecessary boxing of the Integer values.
Method implementation suggestion.  Issue #12
2013-11-24 15:04:49 +02:00
Oskar Wiksten
61ec20c775 Content editor: allow dragdrop reordering conversation replies 2013-11-24 11:42:52 +01:00
Oskar Wiksten
518ada6a82 Content editor: allow reordering items & monsters in table editor 2013-11-24 11:37:37 +01:00
Oskar Wiksten
660504ca72 Content editor: allow reordering quest stages & droplist content 2013-11-24 11:35:28 +01:00
Oskar Wiksten
f5df781fc9 Content editor: enable dragdrop sorting of resources 2013-11-24 11:29:53 +01:00
Oskar Wiksten
50751390a3 Updated Russian translation (thanks dromoz) 2013-11-23 22:28:38 +01:00
Oskar Wiksten
a24672a3f1 Slight border to monsters_rltiles3.png 2013-11-14 23:36:20 +01:00
Oskar Wiksten
b06c5b9b15 Unblur and add border for monsters_men.png 2013-11-14 23:24:21 +01:00
Oskar Wiksten
7cc2d303ef Add border to monsters_men2.png monsters_snakes.png 2013-11-14 23:05:57 +01:00
Oskar Wiksten
106203d85b Read fewer fields from TMX files
* Do not read "tilewidth" and "tileheight" from <map>, always assume 32.
* Do not read "tilewidth" and "tileheight" from <tileset>, always assume 32.
* Do not read "width" and "height" from <layer>, always assume same size as map.
* Do not read "width" and "height" from <objectgroup>, always assume same size as map.
* Do not read <image> inside <tileset>. Always assume tileset name is same as image resource name from ResourceLoader.
2013-11-10 23:40:01 +01:00
Oskar Wiksten
8b3ac992ce Remove obsoleted "width" and "height" on <objectgroup> in TMX files 2013-11-10 21:10:48 +01:00
Oskar Wiksten
1fabb499a9 Spelling corrections Elwyl: both our sakes -> both our sake 2013-11-10 13:50:37 +01:00
Oskar Wiksten
51e63167a0 Bump version to 0.7.1a1 (versiocode 41) 2013-11-10 12:49:50 +01:00
Oskar Wiksten
37ef73d9e2 Add xhdpi and xxhdpi icons. Update to SDK 19. 2013-11-10 12:09:36 +01:00
Oskar Wiksten
b950993852 Update French and Russian translations (thanks Marwane K and dromoz!) 2013-11-10 11:27:08 +01:00
Oskar Wiksten
4a2aa90373 Update PO with clarification of Lodar's def pots 2013-11-10 11:16:39 +01:00
Oskar Wiksten
161f516a98 Clarify monster locations in quest & conversation for Lodar def pot (thanks dromoz!) 2013-11-10 11:14:14 +01:00
Oskar Wiksten
c002405008 Updated translations (thanks Marwane K. & Andrej Znidarsic) 2013-11-03 16:24:38 +01:00
Oskar Wiksten
d4ff63d456 Merge branch 'reduce-warnings' 2013-11-03 15:07:13 +01:00
Oskar Wiksten
e8d0162ceb Refactor: Reduce warnings / reduce scope 2013-11-03 15:05:27 +01:00
Oskar Wiksten
eba387159e Refactor: Use enum instead of int for result of loading a savegame 2013-11-03 15:05:21 +01:00
Oskar Wiksten
6006fe1eb5 Refactor: Don't use hardcoded text for placeholders 2013-11-03 14:57:07 +01:00
Oskar Wiksten
f6559cac31 Refactor: remove unused resources 2013-11-03 14:55:59 +01:00
Oskar Wiksten
9405ad323a Bugfix: do not hardcode map names when upgrading savegame 2013-11-03 12:40:13 +01:00
Oskar Wiksten
b0f9ba9abe Bugfix: Do not assume that all saved maps are visited
* Maps that have deactivated spawn areas should be saved, but does not neccessarily have to be visited.
2013-11-03 10:22:05 +01:00
Oskar Wiksten
086fb199cf Remove Fallhaven prisoner when reaching quest farrik:70 2013-11-03 09:35:21 +01:00
Oskar Wiksten
b898cf7f7c Rename TMX property "outside" to "outdoors".
* Outdoors is a better name for this, because that's what we actually mean by it. Outside is ambiguous in this context. Outside is what it's called in Swedish :)
2013-11-03 08:20:00 +01:00
Oskar Wiksten
aacf97e274 Add requirement type: "hasActorCondition"
* Enables scripts and conversations to choose options based on whether the player has a certain actor condition or not.
2013-11-02 10:24:07 +01:00
Oskar Wiksten
d58db6efc4 Merge branch 'activate-spawnareas' 2013-11-02 09:27:11 +01:00
Oskar Wiksten
4a1c6779cf Enable scripts to activate/deactivate spawn areas & mapobjects
Renames "isActive" on spawnareas to "isSpawning" - so that a spawn area can be non-spawning but still have monsters left in it.
Adds new scripteffect types:
* "spawnAll" = sets  spawn area to spawning and spawns all monsters
* "removeSpawnArea" = sets a spawn area to non-spawning and removes all mobs
* "deactivateSpawnArea" = sets a spawn area to non-spawning
* "activateMapChangeArea" = sets a mapchange area to non-active
* "deactivateMapChangeArea" = sets a mapchange area to non-active (so that it does not teleport the player)
Adds new property "active" to spawn- and mapchange areas in tmx files, that determines whether the areas are active when starting a new game.
2013-11-02 09:26:04 +01:00
Oskar Wiksten
a2caea0a83 Refactor: Flatten some forward-arrow-pattern ifs to vertical code 2013-10-27 15:29:27 +01:00
Oskar Wiksten
4209f91d00 Bugfix: also save maps that use non-default values
* For example, maps that have had some spawn area deactivated should be saved in the savegame.
2013-10-27 14:17:40 +01:00
Oskar Wiksten
88f15b9099 Merge pull request #10 from oskarwiksten/persist-isactive-on-mapobjects-in-savegames
Save 'isActive' for MapObjects & SpawnArea in savegames
2013-10-27 05:55:42 -07:00
Oskar Wiksten
20ed608523 Save 'isActive' for MapObjects & SpawnArea in savegames
* Stores the "isActive" boolean in savegames for map objects and spawn areas
* Adds functions in MapController to activate and deactivate MapObject areas
* Adds functions in MonsterSpawnController to activate and deactivate MonsterSpawnAreas
* When a spawn area is deactivated, all monsters should be removed, since the spawn area is considered to be non-existant.
* Adds boolean "isActiveForNewGame" to map objects and spawn areas, that specify what "isActive" should be set to when starting a game. (Initially, all of these are true)
* This commit does not add any way to actually activate or deactive areas. That can come as a later commit (possibly using script effects to do that).
2013-10-27 13:04:09 +01:00
Oskar Wiksten
c001532106 Merge branch 'rename-phrase-reward-to-script-effect' 2013-10-27 10:59:56 +01:00
Oskar Wiksten
a8ad00c21c Refactor: Rename PhraseReward -> ScriptEffect
* This commit does not contain changes to json field names when parsing phrases though.
2013-10-27 10:59:21 +01:00
Oskar Wiksten
079511a30c Rename file Reward.java -> ScriptEffect.java 2013-10-27 10:52:11 +01:00
Oskar Wiksten
6fce649cbb Always deny monster movement on mapchange,keyarea,rest - regardless of isActive 2013-10-27 10:12:27 +01:00
Oskar Wiksten
d2c3eb9106 Refactor: rename functions for saving PredefinedMap data 2013-10-27 09:33:24 +01:00
Oskar Wiksten
53331aef1b Code reformat: Ctor arguments should be one arg per line
* Vertical list makes it easier to version control additions and removals of single parameters
2013-10-27 09:09:09 +01:00