Compare commits

...

724 Commits

Author SHA1 Message Date
Zukero
3b28c2f378 Desaturated the clouds' colors. Even less saturation for faraway ones.
Clouds speed should be even more consistent across different devices.
Also made the title screen's UI backgrounds "clickable" so a misclick
doesn't hide the UI too easily.
2018-03-26 16:26:52 +02:00
Zukero
055a2eaf32 Finally fixed clouds' lowest position.
Slower logo animation.
Larger logo.
2018-03-26 14:02:28 +02:00
Zukero
8b2dbb4ead Cleanup and consistency. 2018-03-23 17:04:53 +01:00
Zukero
a905d8b08a Better handling of clouds position 2018-03-23 16:56:47 +01:00
Zukero
e594713a9b Attempts to fix clouds position's screen ratio independence & threading
issues on loading dialog.
2018-03-23 16:48:28 +01:00
Zukero
a98df96474 New animation for title logo. Better clouds scaling (now same
pixel-width as mountains etc.). Better loading animation. Clouds
animation now also showing behind loading dialog. Still need to enhance
support for low-end devices.
2018-03-22 17:34:04 +01:00
Zukero
470bc423ef Added custom loading animation. Saved some PNGs in indexed color mode,
saving space.
2018-03-14 18:45:15 +01:00
Zukero
03d67209cd Attempts to reduce memory usage of title screen and to improve
consistency over varied screen sizes and DPI (from spica to Full HD PC
through high-end 5" phone). Far from complete...
2018-03-13 18:55:12 +01:00
Zukero
1bb52b1f0e More changes to the clouds. 2018-03-12 18:57:37 +01:00
Zukero
e6dda3651d Enhanced title screen's clouds animation. 2018-03-12 15:46:08 +01:00
Zukero
bf154e058b Progress towards target title screen. 2018-03-09 18:03:19 +01:00
Zukero
d6d473a3d7 Started integrating new title screen drawables. Crashes on my phone
though :/
2018-03-08 18:28:54 +01:00
Zukero
67f2c41ac9 Preparatory works for new title screen 2018-03-07 17:51:58 +01:00
Zukero
d285871321 Merge branch 'master' into title_screen
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
2018-02-28 17:09:23 +01:00
Zukero
97bffa86c7 Fixed rendering when animations are disabled. Backported automatic
sizing of TileCollection from stoutford_tests.
2018-02-28 12:09:03 +01:00
Zukero
68b60a0286 Merge branch 'master' into title_screen
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
2018-02-27 18:43:53 +01:00
Zukero
ec733e5b97 Moving sprites do not each trigger a redraw in concurrent threads.
There is now a unique timer that triggers unified timely redraws when
there are sprites moving around. The downside is the moving NPC always
trigger full-screen redraws. On the upside, it should prevent stuttering
when there is a large number of NPCs moving at the same time, as they
were each asynchronously triggering redraws.
2018-02-27 18:37:55 +01:00
Zukero
7d2134205c SpawnArea's spawn group can refer to a specific monster type, even if
the spawn group doesn't exist and that this monster type belongs to a
specific spawngroup (like in ATCS).
2018-02-27 14:29:39 +01:00
Zukero
f4c762026d Merge branch 'master' of https://github.com/Zukero/andors-trail.git 2018-02-22 23:29:37 +01:00
Zukero
3708c4886e Added new graphics layer "top" above the "above" layer. 2018-02-22 16:43:38 +01:00
Zukero
da59c7143d Spawn areas now allow a boolean property "ignoreAreas", false by
default, that allows monsters from this area to be spawned and moved
over other game objects, like key areas, mapchange areas and rest areas.
2018-02-22 16:19:26 +01:00
Zukero
2ade99eed0 Backported new debug buttons from title_screen branch into master. 2018-02-22 16:00:33 +01:00
Zukero
752a3b64f0 Fixed worldmap recenter that failed on some devices. Now handled in Java
instead of Javascript.
2018-02-22 15:49:36 +01:00
Zukero
4fb476a94e Merge pull request #33 from carceris-magister/mikhail
Mikhail
2018-02-22 13:52:22 +01:00
Zukero
153ea0a660 Fixed narrator messages being greyed out as rewards. 2018-02-12 22:06:16 +01:00
Zukero
27a2a87949 Merge separate changes. 2018-02-12 21:52:15 +01:00
Zukero
b77c1b3f94 Fixed bug preventing modified maps from being updated on the worldmap
upon visiting them.
2018-02-12 13:46:22 +01:00
Zukero
5b8e3a7ae4 Merge pull request #45 from Rijackson/master
Fix for cliff heights in Crossglen
2018-02-10 16:58:01 +01:00
Rijackson
8a0af4038a Fixed fix for cliff heights in Crossglen. 2018-02-10 10:08:16 -05:00
Rijackson
98bf2d0381 Fix for cliff heights in Crossglen 2018-02-10 10:03:38 -05:00
Zukero
e300c1383e Merge branch 'master' of https://github.com/Zukero/andors-trail.git 2018-02-10 14:32:53 +01:00
Zukero
193048cb8f Added "alignmentSet" reward type for dialogues. 2018-02-10 14:32:36 +01:00
Zukero
23faa6d19c Fix mis-clicks around the "flee" buttons (and all of the Combat UI)
triggering an attack.
You are now allowed to use fat fingers.
2018-01-15 11:55:40 +01:00
Zukero
332eee0736 Merge remote-tracking branch 'origin/master' into title_screen 2018-01-15 11:35:11 +01:00
Zukero
421a03980a Bug fix for factionScore requirements 2018-01-15 11:34:25 +01:00
Zukero
0a04b516dd Fixed another (hopefully the last one) issue introduced during the Great
Reordering of content (loss of requirements negation in Dialogues'
replies).
2017-12-12 23:35:27 +01:00
Zukero
b87617e7eb Renamed themes. 2017-12-09 15:36:01 +01:00
Zukero
1be47b2e0e Fixed the green theme colors. Added dark gray theme. Renamed the themes
after metals.
2017-11-22 23:29:33 +01:00
Zukero
5b6301998e Forgot to update a color ref for green. 2017-11-22 18:24:55 +01:00
Zukero
14f83283fb No more "gold", green instead. All made from blue using scripts. 2017-11-22 18:22:47 +01:00
Zukero
bca34db508 Cleanup of all UI bitmaps, to have a cleaner, more consistent color
palette, easing the scriptability of derivatives creation.
2017-11-22 16:17:34 +01:00
Zukero
7e2494196c Fixed ListSeparator bugs introduced with recent change.
New and enhanced debug buttons!
2017-11-21 15:07:35 +01:00
Zukero
a54798443a Fixed compatibility with Donut (1.6). Better list separator. Shops tabs
were mysteriously forgotten, until now, so I added icons too.
2017-11-20 23:52:38 +01:00
Zukero
413bf66c68 Removed Red, replaced by Gold. Not really pretty either... but it now
works... except on Android 1.6...
2017-11-20 18:50:10 +01:00
Zukero
827260c90f First phase in attempt to provide several UI themes. 2017-11-19 22:37:03 +01:00
Zukero
b24e348c51 Another one. 2017-11-18 00:10:48 +01:00
Zukero
cbdb53c813 "Really" fixed minor coloring issue. 2017-11-18 00:09:26 +01:00
Zukero
92793c73cf Fixed minor coloring issue. 2017-11-18 00:07:44 +01:00
Zukero
d81ed7a6b5 Fixed styles. Now correctly themeable. 2017-11-18 00:06:24 +01:00
Zukero
df81e96a08 WARNING: Does not run!
Huge clean-up. Separation between themes and style. Preparatory work for
theme inheritance and alternative themes made by derivation.
Problem: due to a pre-lollipop bug, I still have to remove some color
indirections through attributes, as they are not preperly resolved.
2017-11-17 19:20:35 +01:00
Zukero
8c28166c11 Fixed issue in Vilegard where you could talk about the Xulviir and the
Feygard swords to all merchants instead of only the smith while Vilegard
people distrusts you.
2017-11-17 12:01:38 +01:00
Zukero
f1867667aa More layout fixes 2017-11-17 11:55:49 +01:00
Zukero
af052408b1 More layout fixes on the rangebar. 2017-11-14 22:45:11 +01:00
Zukero
a4d1e8b463 Clean up stylesheets. 2017-11-14 22:35:34 +01:00
Zukero
e93810876c "More" action button presence in ItemInfoActivity corrected. 2017-11-14 22:17:51 +01:00
Zukero
aea3571ca5 Fixed title screen animation for Lollipop+
Larger buttons overall and better spacing between replies.
2017-11-14 19:03:58 +01:00
Zukero
81c0c1a7ff Animated logo on title screen 2017-11-13 16:43:08 +01:00
Zukero
5b2b787f90 Fixed Dialog button text color on old android versions. 2017-11-13 14:16:50 +01:00
Zukero
1d0bdf1e4e Added recenter button on worldmap. 2017-11-13 13:55:04 +01:00
Zukero
4cdc08b360 Layout tweaks and bug fixes. 2017-11-13 12:35:01 +01:00
Zukero
0f90281e0f Fixed worldmap scrolling. Removed useless "More" button on item info
when opened from shops.
2017-11-13 10:33:57 +01:00
Zukero
f06e0d714a Added missing credit. 2017-11-11 09:08:22 +01:00
Zukero
bccab0421a Credited authors 2017-11-11 08:57:27 +01:00
Zukero
cef4000391 Preferences OK. Finally, the whole UI is under control. 2017-11-10 23:34:20 +01:00
Zukero
13a8e351bd ListPreferences popup issue almost fixed. 2017-11-10 20:01:30 +01:00
Zukero
e3ca04cde7 'More' button in item info view to go back and forth between simple
click and long click menus in the inventory.
2017-11-09 16:52:57 +01:00
Zukero
6394353fa0 Custom context menu on inventory now works. 2017-11-09 16:39:30 +01:00
Zukero
3598624a8e Reimplementation of the inventory context menu. Not complete yet.
Android doesn't help...
2017-11-09 00:35:22 +01:00
Zukero
b57f847b09 Nice combo boxes, erm, spinners, emulated through a button and a dialog.
Dual-sized heroes.
Did "Organize imports" in eclipse on the whole project, so almost all
java files are changed, but not by much.
2017-11-08 18:36:17 +01:00
Zukero
f161926a75 Spinner emulation for inventory filters. Allows greater control over
dropdown menu L&F.
2017-11-08 00:16:55 +01:00
Zukero
763c964b17 Better readability of magnitude & duration in actor condition bars.
Better list item borders bitmaps.
2017-11-07 18:50:06 +01:00
Zukero
7122907cc0 Nice actor conditions indicator bars. 2017-11-07 17:30:32 +01:00
Zukero
f9c3bc6bf6 Color palette in resources. Conversation activity uses it now.
Preferences category headers fixed.
2017-11-06 23:53:40 +01:00
Zukero
f78862e778 Better tabs, bettertext color consistency, UI skinning not yet
completed...
2017-11-06 19:08:31 +01:00
Zukero
effc7b6446 More tiny tweaks. 2017-11-06 00:23:44 +01:00
Zukero
5b28c58523 More tiny tweaks. 2017-11-06 00:22:54 +01:00
Zukero
164990ec6b Tabs in hero view are now themed. Also, preparatory works for Dual-size
hero icons, and more UI tweaks.
2017-11-06 00:20:10 +01:00
Zukero
a017fbcf67 More progress on the UI skinning effort. Combat view now shows an AP
bar.
2017-11-05 17:37:50 +01:00
Zukero
e4be5d35a8 New Dialog system for better UI control. ALmost there... 2017-11-05 01:47:27 +01:00
Zukero
e87ea318ec More UI tweaks... getting there... 2017-11-04 00:17:11 +01:00
Zukero
3a8ad1395f More UI tweaks... not there yet. 2017-11-03 18:06:50 +01:00
Zukero
335c853acd Theme refining 2017-11-03 11:03:46 +01:00
Zukero
6787a0ac4b More UI tweaks. 2017-11-02 19:10:23 +01:00
Zukero
a4694be347 UI Styling like crazy. 2017-11-02 19:05:15 +01:00
Zukero
a8b24abb39 Select your hero !
Support for three different hero sprites.
Externalized New Game Creation in a separate fragment.
Enhanced title screen UI.
Continuable game preview.
2017-10-31 18:26:11 +01:00
Zukero
6cfe381b84 First test at enhancing the start screen UI. 2017-10-30 18:12:30 +01:00
Zukero
29379be41c UI to show actor conditions active on the targeted NPC during battle. 2017-10-24 18:23:45 +02:00
Zukero
8667e925f3 Simple bug fix where full round triggers incorrectly decreased
conditions duration for monsters, while it doesn't for players.
2017-10-22 17:59:18 +02:00
Zukero
5d82232453 Merge remote-tracking branch 'choose_remote_name/master' 2017-10-03 22:47:14 +02:00
Zukero
716b96b624 Even a NPC with a 1x1 spawn area can track a player down. 2017-10-02 19:04:27 +02:00
Zukero
afadac0f2f NPCs don't need to be aggressive to "pathfind" the player anymore. 2017-10-02 18:24:05 +02:00
Zukero
60edd73fc2 Removed unnecessary warnings about replace area requirement-related
properties.
Added code to clear the "isApplied" flag on a replace area when another
replace area is applied later and intersects with the first one.
2017-10-02 16:32:31 +02:00
Zukero
4b4a10ec62 Merge pull request #38 from sdevaney/master
Readme and contributors list
2017-09-29 09:17:44 +02:00
Scott Devaney
597f90da21 fix last of relative links 2017-09-28 17:02:17 -04:00
Scott Devaney
b7fe6864d3 fix relative links 2017-09-28 16:59:07 -04:00
Scott Devaney
3841e00c3a Updated readme v0.2
Broke out gfx and additional contribs to their own file.
Added additional Authors
2017-09-28 16:53:30 -04:00
Scott Devaney
6052788322 Contributors lists
added contributors lists and broke out graphics to another file since it is so long
2017-09-28 16:41:25 -04:00
Scott Devaney
d4e82b4e68 First readme for AT
Readme v0.1
2017-09-28 14:14:40 -04:00
Zukero
e0c7dd35b8 Items' onHitReceived effects now applied. 2017-08-29 18:47:35 +02:00
Zukero
ea03360145 Bug fixes and first tests with debug content for the revenge strike and
enhanced combat log features.
2017-08-28 18:32:43 +02:00
Zukero
a17eaadf4e Added UI to show the stats for the "revenge strike" feature. 2017-08-28 17:52:34 +02:00
Zukero
da76ea4542 Revenge effects & Enhanced combat log.
Apply effect when you or a NPC received a hit (effect defined on
defender).
Apply effect when a NPC dies (effect defined on NPC).
Messages in the combat log for taunt skill and actor conditions effects.
2017-08-28 16:55:53 +02:00
Zukero
93bdb8e18f New icon for immunity overlay. 2017-08-28 13:15:39 +02:00
Zukero
ab61c774bf Added immunity as a dialogue reward type.
Debug content can trigger all event types.
2017-08-27 12:58:14 +02:00
Zukero
9b42b246bb Reapply item-borne condition prevented by a now worn out temporary
immunity.
2017-08-27 10:21:04 +02:00
Zukero
aeaa5ffd42 Fixed issues in immunity management:
- Can detect the case where you unequip an item that grants an immunity
while having another, temporary, immunity to the same actor condtion
- Reapplies an AC coming from an equipped item when you unequip another
item that granted immunity.
- Added immunities to the saves.
2017-08-27 09:45:51 +02:00
Zukero
84059a575f Actor condition immunity! It works!
For a few rounds with a positive duration, or forever with 999 duration,
or as part of the equip_effect on an item. Examples in the debug items.
2017-08-27 00:47:29 +02:00
Zukero
cd508e70f1 Included new tilesets in the resource loader.
Also added comment flags to prepare for generation of these lines by
ATCS.
2017-08-25 23:45:26 +02:00
Zukero
edecf946b2 Merge pull request #35 from Rijackson/master
Added japozero spritesheets to master branch. Also a new item sprite …
2017-08-25 23:32:55 +02:00
Zukero
d15e15a897 Fixed bug in feature ending a round at the end of a combat that caused
an infinite recursion (Stack overflow) when the combat ended due to
player death while afflicted by an actor condition.
2017-08-21 14:40:46 +02:00
Rijackson
6a4c949ad5 Added japozero spritesheets to master branch. Also a new item sprite (recolored flowers for the damerialias), and some new map sprites (a new window, some new fences/pillars, and some crossings for the rail tracks). The map sprites are only in experimental maps, but I thought I should make them available to anyone doing map making. 2017-08-20 19:10:20 -04:00
Zukero
acf15e5b6d Added the new "factionScore" requirement type. 2017-08-20 11:13:57 +02:00
Carceris Magister
8f8bcf8a6c Use proper JSON boolean for negate statements 2017-08-18 22:47:49 -04:00
Carceris Magister
a5e10aaf0b Merge branch 'mikhail' of github.com:carceris-magister/andors-trail into mikhail 2017-08-18 22:42:48 -04:00
Carceris Magister
ff61d64c83 Merge branch 'master' of github.com:Zukero/andors-trail into mikhail 2017-08-18 19:41:47 -04:00
Zukero
7086684eb0 Replace areas can now use complete requirements, like Key areas, not
only "questProgress" ones. Untested. Beware.
2017-08-18 16:08:35 +02:00
Zukero
2e631c74da Merge pull request #34 from carceris-magister/mikhail-poison
Fixed dangling reference in Mikhail's conversation list.
2017-08-17 17:49:48 +02:00
Carceris Magister
101d722ae6 Fixed dangling reference in Mikhail's conversation list. 2017-08-17 09:16:36 -04:00
Carceris Magister
195b8eb5f9 Improved Mikhail's initial dialog with more context and to avoid repeating opening monologue (info still available when character asks.) 2017-08-16 21:13:08 -04:00
Zukero
f9ea913bba Cleaner formula for previous dual-wield fix. 2017-08-16 21:09:09 -04:00
Zukero
ed4fd97e1c Cleaner formula for previous dual-wield fix. 2017-08-11 13:10:01 +02:00
Zukero
7c6aea4d7c Fixed Dual-Wield level 1, so that the resulting attack cost is the
slowest weapon + half the fastest weapon, instead of the main hand +
half the off-hand.
Implies changes to the skill description in the string ID
skill_longdescription_fightstyle_dualwield.
2017-08-11 13:05:22 +02:00
Zukero
1751b9d765 Fixed and robustified the pathway_fallhaven quest. 2017-08-11 10:41:44 +02:00
Zukero
ee838d67c8 Merge pull request #30 from dacmot/end_round_at_end_of_combat
End round at end of combat
2017-07-25 21:07:01 +02:00
dacmot
a3a043b993 Add myself to authors 2017-07-25 14:55:25 -04:00
Dacmot
2c95d0b88d Add back round counters reset and move a function call to put it with similar functions 2017-05-22 22:37:14 -04:00
Dacmot
a8a1b13d49 Perform end-of-round in combatExit() and remove resetRoundTimers() 2017-05-22 13:20:27 -04:00
Dacmot
fedff3eca1 Revert change in newPlayerTurn() which did not work 2017-05-21 16:38:14 -04:00
Dacmot
45d90689f8 Ensure turn ends at the end of combat 2017-05-16 22:57:32 -04:00
Zukero
bda232cbc1 Merge pull request #29 from Rijackson/master
Minor changes to Mikhail's dialog
2017-05-11 23:38:02 +02:00
Rijackson
477f1d9326 Minor changes to Mikhail's dialog from Tom, that give a little information about raw meat and food poisoning. 2017-05-11 17:10:01 -04:00
Zukero
ef856c7891 Merge pull request #28 from HummusSamurai/master
Fixed incorrect selection of inventory item when long-pressed.
2017-04-06 17:26:24 +02:00
HummusSamurai
1677c30292 Fixed incorrect selection on item's long-press. 2017-04-06 16:16:34 +03:00
Zukero
aa49668008 Merge pull request #27 from Rijackson/master
Added myself to authors.
2017-03-26 18:08:34 +02:00
Rijackson
6b599977e7 Added myself to authors. 2017-03-26 11:57:29 -04:00
Zukero
8b06f6c65a Merge pull request #25 from Rijackson/master
Fix for problem where if you kill Toszylae and walk away without the …
2017-03-26 16:21:22 +02:00
Zukero
52f091d206 Update conversationlist_blackwater_harlenn.json
Removed a leading space.
2017-03-26 16:05:26 +02:00
Zukero
40da3e5dec Merge branch 'master' into master 2017-03-26 16:02:59 +02:00
Rijackson
808bb090fc Fix for IsStacking and IsPositive problems 2017-03-19 16:02:31 -04:00
Zukero
f9e472291b Merge pull request #26 from HummusSamurai/bugfix-skills-sort
Fixed bug where game crashed if some skills had no requirements when sorted.
2017-03-01 17:06:44 +01:00
HummusSamurai
6fec8de9be Fixed bug where game crashed if some skills had no requirements when sorted. 2017-03-01 16:47:18 +02:00
Zukero
1ac48619ca Flag changed. 2017-02-23 18:10:26 +01:00
Zukero
c667305f25 Merge branch 'master' of https://github.com/Zukero/andors-trail 2017-02-22 22:42:01 +01:00
Zukero
8c0dd7cb6c More bugfix for actorConditions (used iStacking instead of isStacking in
last fix batch o.O)
2017-02-22 15:31:03 +01:00
Zukero
efcf683adf Merge pull request #22 from HummusSamurai/feature/SortingAndCategories
Feature/sorting and categories
Inventory, skills and shoplists can now be filtered and sorted !
Thank you M.H. Alkotob.
2017-02-22 14:13:24 +01:00
M.H. Alkotob
4eff7a97c9 Changed layout_height(s) to "wrap_content" 2017-02-22 14:40:13 +02:00
Zukero
dde191b6da Restored isPositive and isStacking values in actor conditions, destroyed
due to a bug in ATCS.
2017-02-21 19:20:23 +01:00
M.H. Alkotob
afaf284a59 request changes 2017-01-31 10:21:41 +02:00
Rijackson
fc7e47b109 Also left some debug stuff in one file. This fixes it. 2017-01-29 20:41:52 -05:00
Rijackson
0838d20128 It was not my intention to make the Corrosive slime condition non-stacking, only to fix the capitilization. This fixes the error. 2017-01-29 20:34:06 -05:00
Rijackson
cf4a381f06 Fix for problem where if you kill Toszylae and walk away without the helmet, you are doomed. There is nothing in any subsequent dialogue to give you a hint to go and look for something where you killed the lich, and in fact Talion's dialogue tree is simply wrong. The only way to get past talion_demon_1 is to have darkprotector:10. If you don't have that, the only available reply is "No, I have not killed it yet", even though you have. The only thing you can do with Urlifendor is go through a long dialogue sequence that arrives at the selector ulifendor_infected_18_s. That has two replies, but one requires toszylae:70, which you can't get until you have darkprotector:10, so of course you don't have it. So the only available reply is "OK. I will defeat the lich first. Goobye", even though you have already defeated it.
The helmet is now on the shrine behind the lich. When you pick it up, it disappears (mapchange). If you try to leave without it, you get a very big hint.

This is still not perfect. I could not figure out any way to change Talion's or Ulifendor's dialogue without a huge amount of work (the logic in the dialogues and the three interleaved quests is very bad, and in some cases only works because one mistake cancels another. I do not want to mess with it). This means that if the player kills the lich and still leaves without the helmet, despite the hint, the dialogues still make no sense. That is much less likely to happen now though.

I have tested this, and everything seems to work as desired.

There are also a number of other typo fixes, as reported on the forums, and I made the GoW extraordinary (as also reported on the forums).
2017-01-29 20:18:34 -05:00
Zukero
5aeca2a1eb New Script reward type: "changeMapFilter", needs a mapName and effectID.
Works on currentmap too.
2017-01-25 18:50:16 +01:00
Zukero
8f7352db33 Fixed an issue that prevented quickslots quantities from being updated
when you loot an item that goes there. (Reapplied changes in commit
missed during quickslots_custom_ui merge)
2017-01-24 12:59:38 +01:00
Zukero
f10d3f70af Fixed large monsters movement (not used yet, but it bothered me). They
couldn't move because there always was a monster in the way: themselves.
And redrawing area wasn't computed correctly.
2017-01-23 17:55:00 +01:00
Zukero
e8ace3666d EOL restoration 2017-01-23 16:44:26 +01:00
Zukero
ef2af81e87 Quickslots assignment UI - now it's looking better. 2017-01-21 00:34:50 +01:00
Zukero
941b8332e5 Redesign of quickbuttons assignment UI. 2017-01-20 18:36:19 +01:00
Zukero
322e176be9 Fixed large monster issuem introduced with content reordering, but
solved by adding more flexibility and removing the "size" field in
monsters.
2017-01-20 15:04:17 +01:00
Mohamad Alkotob
7c61ad5f81 extra newlines 2017-01-13 16:52:17 +02:00
Mohamad Alkotob
7afe881ead extra newlines 2017-01-13 16:51:39 +02:00
HummusSamurai
0a8259d5a8 Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories 2017-01-13 16:50:14 +02:00
HummusSamurai
a60e2ab4c5 The sorting/category buttons in the inventory are now above the inventory list directly. 2017-01-13 16:49:43 +02:00
Mohamad Alkotob
ffd37a709b Added name under "Additional programming"
Initials before surname due to ethnic saltiness
2017-01-06 16:04:44 +02:00
Mohamad Alkotob
410f796c31 Update HeroinfoActivity_Inventory.java 2017-01-05 09:26:37 +02:00
Mohamad Alkotob
4b58722b05 end already 2017-01-05 09:23:57 +02:00
Mohamad Alkotob
2b6ce058b6 guess what more tabs 2017-01-05 09:23:09 +02:00
Mohamad Alkotob
6c9fcd5b46 tabs 2017-01-05 09:20:48 +02:00
Mohamad Alkotob
998c56d8ab excess tabs 2017-01-05 09:17:34 +02:00
HummusSamurai
a119fde366 un-used import 2017-01-04 19:59:59 +02:00
HummusSamurai
544ecd1c49 Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
2017-01-04 19:51:25 +02:00
Mohamad Alkotob
a186715eab almost 2017-01-04 19:38:17 +02:00
Mohamad Alkotob
7ea485f8ca please 2017-01-04 19:36:47 +02:00
Mohamad Alkotob
988e94f62f yup that happened 2017-01-04 19:24:20 +02:00
Mohamad Alkotob
7936a223f5 lord 2017-01-04 19:23:14 +02:00
Mohamad Alkotob
f61ba8bd06 damn 2017-01-04 19:19:28 +02:00
HummusSamurai
c42e5b80bd Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
2017-01-04 19:17:41 +02:00
HummusSamurai
5283b04615 git integration in Android Studio is ugly 2017-01-04 19:16:44 +02:00
Mohamad Alkotob
e2b8ac73e8 a space 2017-01-04 19:13:03 +02:00
Mohamad Alkotob
1905e39e43 style 2017-01-04 19:12:42 +02:00
Mohamad Alkotob
8fdd8a3cbf reverting style 2 2017-01-04 19:10:49 +02:00
Mohamad Alkotob
5be73b8b00 reverting style 2017-01-04 19:10:04 +02:00
Mohamad Alkotob
5ac4b9ed5f reverting style 2017-01-04 19:09:21 +02:00
Mohamad Alkotob
c27567c479 reverting style 2017-01-04 19:08:35 +02:00
Mohamad Alkotob
66898885fa reverting style 2017-01-04 19:06:21 +02:00
HummusSamurai
1b69561667 git integration in Android Studio is ugly 2017-01-04 19:02:58 +02:00
HummusSamurai
8627d3f870 reverted style changes in Inventory.java 2017-01-04 19:00:50 +02:00
HummusSamurai
f5caea903a Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories 2017-01-04 18:45:40 +02:00
HummusSamurai
ee24226c8e git ignore 2017-01-04 18:32:39 +02:00
Mohamad Alkotob
b66a4b3360 + new line 2017-01-04 18:26:18 +02:00
Mohamad Alkotob
fd9bad2ca5 lazy undo 2017-01-04 18:25:54 +02:00
Zukero
ac2c4d7313 Solved button text no showing in shops issue.
All button instances in XML layouts now use layout_height="wrap_parent"
and minHeight="0dp" instead of a fixed 35sp size. It should be safer.
2017-01-04 15:38:42 +01:00
HummusSamurai
3e6921d101 Inventory sort/category is implemented (only buttons were there before) and favorites no longer show in UI 2017-01-04 11:27:31 +02:00
life
0907b0978d Skills, Inventory, and Shops now have the Sort & Category options in the UI. 2017-01-04 01:29:46 +02:00
Zukero
91ac4cc449 Replaced all JSON files by ones re-exported by ATCS, to prepare for
cleaner diffs.
2016-12-21 17:18:34 +01:00
Zukero
af85f0edf6 New colorfilter values : redtint, greentint, and bluetint. 2016-08-10 18:00:15 +02:00
Zukero
d47704200c New Black & White color filter. Set the "colorfilter" property of a map
to "bw".
2016-08-08 16:27:15 +02:00
Zukero
9840078ef3 Replaced android.util.FloatMath by java.lang.Math 2016-08-08 12:26:55 +02:00
Zukero
49e5c9d930 New map-level property : "colorfilter".
Possible values are "black20", "black40", "black60", "black80", and
"invert". 
The blackXX ones add a black shade on the map (making them look darker,
like unlit caves), that has a 20% to 80% opacity. The invert one make
the screen use inverted colors. Others could be added, but only static
ones, like a B&W mode for example.
Animated ones ( like continuous gamma rotation ) aren't viable
performance-wise.
2016-08-08 12:22:12 +02:00
Zukero
96fb165929 Patched all maps to include latest set of tilesets. 2016-08-08 11:30:30 +02:00
Zukero
03642d9dec Bug fix in Surprise preventing quest from being completed. 2016-08-05 17:58:39 +02:00
Zukero
d126d1ebfd ATTENTION: changes to map format.
Object Group can be set property "active" to "false" to disable all
objects within at new game (except Spawn Areas, those are treated
individually).
(de)activateMapChangeArea script rewards become
(de)activateMapObjectGroup
Persistence of active object groups in saves is implemented.
Debug map showcases the new feature, with beer !
2016-07-19 17:00:19 +02:00
Zukero
6f757c66f4 Updated to version code 43.
Maps now save the spawn area ID, to have better control over which are
activated or not.
All maps refactored to have unique spawn area id. Spawn group now
defined in "spawngroup" property instead of name (id).
2016-07-18 18:51:38 +02:00
Zukero
549d7f30a7 Fixed Health and XP bars bug for Marshmallow devices. Tested down to
Donut on x86 VM.
2016-04-26 13:30:03 +02:00
Zukero
b0061ee736 City of Stoutford added, and integrated. Now it needs people... 2016-01-06 23:18:52 +01:00
Zukero
5202b16ac7 Small fix for unescaped apostrophe in Spanish text 2016-01-06 22:34:25 +01:00
Zukero
0dfc18480e Merge branch 'halvor' 2016-01-06 22:30:58 +01:00
Zukero
268d8f3023 First merge of Halvor's "Surprise !" quest. 2015-12-08 15:08:56 +01:00
Zukero
d5c358879b Merge pull request #15 from Xaver-Entropia/Spanish-Translation
res/values-es/strings.xml - Better spanish translation (Part 1)
2015-11-20 21:28:42 +01:00
Xaver-Entropia
6a910e9683 res/values-es/strings.xml - Better spanish translation (Part 1)
The spanish translation made my eyes bleed so I decided I could stop bitching and help.
In this first part, i have updated strings.xml only, wich I see is not complete. I will update the rest later, once i have time.
Its not only a translation, but an adaptation, since some concepts sound ridiculous/out of place in spanish.
By the way, I have read the forums, and I can assure you this commit contains no foul languaje nor purposely incorrect things.
2015-11-20 20:16:50 +01:00
Zukero
4cbfb0bb48 Merged weblate changes with conflicting manual adaptations of
localization files.
2015-11-16 11:20:33 +01:00
Jirka Daněk
2fb4c7487a Translated using Weblate (Czech)
Currently translated at 2.7% (175 of 6378 strings)
2015-11-14 11:35:09 +01:00
Nut Andor
d6c563b09f Translated using Weblate (German)
Currently translated at 99.9% (6377 of 6378 strings)
2015-11-13 21:44:45 +01:00
Daniel Stasiak
bdc0e5b234 Translated using Weblate (Polish)
Currently translated at 100.0% (6378 of 6378 strings)
2015-11-13 15:44:53 +01:00
Zukero
3d870e85be Moved string resource "about_interface" from strings_about.xml to
strings.xml, for easier localization on Weblate.
2015-11-13 15:08:26 +01:00
Daniel Stasiak
82f3cb7ff1 Translated using Weblate (Polish)
Currently translated at 100.0% (457 of 457 strings)
2015-11-13 06:44:54 +01:00
Michal Čihař
20dfd45148 Translated using Weblate (Czech)
Currently translated at 2.7% (174 of 6378 strings)
2015-11-12 10:49:11 +01:00
Jirka Daněk
9d40c8c41d Translated using Weblate (Czech)
Currently translated at 2.7% (174 of 6378 strings)
2015-11-12 10:48:57 +01:00
Michal Čihař
946b09c654 Translated using Weblate (Czech)
Currently translated at 2.6% (172 of 6378 strings)
2015-11-12 10:48:33 +01:00
Jirka Daněk
c629e402ab Translated using Weblate (Czech)
Currently translated at 2.6% (172 of 6378 strings)
2015-11-12 10:48:22 +01:00
Michael R. Lawrence
4d752c33ff Translated using Weblate (Spanish)
Currently translated at 20.9% (1337 of 6378 strings)
2015-11-12 09:45:16 +01:00
Michael R. Lawrence
75b54e72e6 Translated using Weblate (Spanish)
Currently translated at 51.2% (234 of 457 strings)
2015-11-12 09:45:15 +01:00
Michael R. Lawrence
8ad423dc70 Translated using Weblate (Japanese)
Currently translated at 3.5% (229 of 6378 strings)
2015-11-12 06:44:46 +01:00
Michael R. Lawrence
4bf40d341f Translated using Weblate (Japanese)
Currently translated at 78.9% (361 of 457 strings)
2015-11-12 06:44:46 +01:00
Jirka Daněk
16faa2a823 Translated using Weblate (Czech)
Currently translated at 2.6% (170 of 6378 strings)
2015-11-11 21:44:15 +01:00
Frank Senft
87748bbf10 Translated using Weblate (German)
Currently translated at 100.0% (457 of 457 strings)
2015-11-10 00:44:34 +01:00
Frank Senft
3aa874fa44 Translated using Weblate (German)
Currently translated at 99.9% (6377 of 6378 strings)
2015-11-09 21:26:04 +01:00
Nut Andor
6f1d163204 Translated using Weblate (German)
Currently translated at 99.9% (6377 of 6378 strings)
2015-11-09 21:25:12 +01:00
Kevin Pochat
e0a6ae0833 Translated using Weblate (French)
Currently translated at 97.1% (444 of 457 strings)
2015-11-09 15:44:29 +01:00
Michael R. Lawrence
cbf253ae3e Translated using Weblate (Spanish)
Currently translated at 100% (0 of 0 strings)

Created new translation.
2015-11-08 06:06:29 +01:00
Daniel Stasiak
6234bcf2e9 Translated using Weblate (Polish)
Currently translated at 100.0% (457 of 457 strings)
2015-11-07 11:48:25 +01:00
Frank Senft
6d874819f9 Translated using Weblate (German)
Currently translated at 100.0% (6378 of 6378 strings)
2015-11-05 23:07:02 +01:00
Kevin Pochat
17095d1838 Translated using Weblate (French)
Currently translated at 96.0% (439 of 457 strings)
2015-11-05 00:01:46 +01:00
Zukero
6e716f9658 Included launchpad translations as of 2015-11-02 11:28 AM UTC 2015-11-04 18:49:17 +01:00
Zukero
910aa384e0 Changed IDs used by some debug resources to avoid overlapping with game
content IDs.
2015-10-30 12:51:48 +01:00
Zukero
f4db713e63 Continued %-symbol deletion. 2015-10-29 16:04:10 +01:00
Zukero
ebbbf0ccfc Removed the useless (and misguiding) % symbol after AC, BC and CC stats.
Removed soon-to-be-closed GCode repository link, replaced by github one.
2015-10-28 17:43:11 +01:00
Zukero
477b839fcd Fixed a few graphical glitches remaining in Lodar's Shortcut 2015-10-28 16:43:01 +01:00
ianh0
3ee48667ab Fixed up several maps
Fixed up Lodar shortcut maps and items
Fixed up Blackwater Mountain fix
Changed worldmap.xml
2015-08-26 20:03:27 +02:00
Zukero
b98ff6f601 Included new quest: pathway_fallhaven (Duleian road shortcut) 2015-08-13 16:33:51 +02:00
Zukero
1457d54733 Fixed bugs, and rephrased many things, in the Lodar Shortcut quest ( now
called The way out is through")
2015-08-12 15:16:27 +02:00
Zukero
22f8a4827a Typos, broken links, and one NPE fixed. 2015-08-11 17:36:25 +02:00
Zukero
903564a037 Fixed blocking & crashing bugs in shortcut_lodar.
Boosted debug values to cope with swarm of Hirathils.
2015-08-10 17:25:04 +02:00
Zukero
84f152683e Some dialogue fixes 2015-08-10 16:54:54 +02:00
Zukero
9dd1183161 Debugged Lodar Shortcut. 2015-08-10 15:15:45 +02:00
Zukero
4d1609d3c4 Fixed UI icons resolution on HDPI devices introduced with sprite upscaling prevention for densities >1
Fixed variable text size in debug buttons
Fixed game crahing & walkalbe issues in new versions of BWM maps.
2015-07-10 15:53:10 +02:00
Zukero
297858f3f0 (Hopefully) fixed OutOfMemoryErrors for low heap-size devices.
Fixed bug in quest "A night visit"
Fixed typo in map blackwater_mountain5a ("quantity " instead of
"quantity")
2015-06-19 16:30:28 +02:00
Zukero
984a6af749 Bitmap loaded with density limited to 1; then scaled with HW scaler.
Preferences can now disable all animations (move, effect, recenter).
Darker colors for past conversation items now less dark.
2015-05-05 16:45:28 +02:00
Zukero
46ae78b8d9 Added missing BWM map (39a) to resource list.
Added limit to 32x32 bitmap loading (<32x32px for density <1, ==32x32px
for density >=1).
2015-04-29 18:18:08 +02:00
Zukero
12b3054b82 Smooth map scrolling.
Use of Hardware Scaler to implement Scaling Factor preference.
Opportunistic pre-rendering of maps in bitmaps.
More consistent frame-rate for all animations.
Many bug fixes in animations and map rendering.
2015-04-29 14:45:12 +02:00
Zukero
e2594d92e8 Changed map rendering from tile by tile to precomputed layer bitmap. 2015-04-27 12:58:48 +02:00
Zukero
defbd007b2 Merged movement animation with "missed" attack animation.
New string in strings.xml, for the "MISS" animated message.
Adapted in-combat movement to have animations there too.
No "sleep" anymore in monster actions. Now relying only on animation
callbacks.
2015-04-14 14:04:05 +02:00
Zukero
f418aa3e3e Merge remote-tracking branch 'origin/animated_moves' into tbrawl_attack_missed_animation 2015-04-14 10:32:30 +02:00
Zukero
6858b462f5 Restored correct "libs/" directory 2015-04-13 17:43:30 +02:00
Zukero
348c9d215d Fixed bugs introduced by new BWM maps. 2015-04-13 17:23:37 +02:00
Zukero
c5cddf96ba Animated movements !
Enhancements in debug map graphics, and more monster to better test
animations.
Player slides from tile to tile in MIN_INPUT_DEPLAY / 2 ms.
Mobs slide at a speed proportional to their Move cost / Max AP ratio.
Animation refresh rate is 25ms.
2015-04-10 11:40:17 +02:00
Zukero
e4575f59cb Merge pull request #9 from MickaelAlvarez/removeQuestProgressEditor
Added removeQuestProgress reward
2015-03-18 23:17:17 +01:00
Zukero
afe54ce33f Merge branch 'remotes/contrib/repeatableQuest' 2015-03-18 23:15:40 +01:00
Zukero
ba58195f49 Code cleanup:
- Removed unused imports.
- Removed useless variable
2015-03-18 23:14:56 +01:00
arnaudcoj
8945d49b59 Delete android-support-v4.jar
That's an error from me
2015-03-16 23:46:44 +01:00
arnaudcoj
88b4dba796 Added an animation when an attack misses 2015-03-16 23:39:49 +01:00
FlorianDoublet
6124e074ec repeatableQuest improvement
repeatableQuest improvement

add our name into authors file

add our name into authors file
2015-03-06 18:53:29 +01:00
LucasDelvallet
804d0feaa0 Method optimisation 2015-03-06 17:54:39 +01:00
LucasDelvallet
00caf44ef1 Added removeQuestProgress Reward 2015-03-06 14:28:33 +01:00
FlorianDoublet
4b406eb4f7 Added repeatable quest 2015-03-06 13:57:43 +01:00
LucasDelvallet
f9e7455f14 Modified the quest editor, in order to allow the creation of a removeQuestProgress reward in any stage of a quest. If the field is emmpty, the stage won't have a this reward. In order to work, the progress must exit in the quest. 2015-03-02 15:01:07 +01:00
LucasDelvallet
f8143c8957 Added missing line
Added the missing line who put numberOfNewMessage to 0
2015-02-26 13:51:53 +01:00
LucasDelvallet
31dc4f7ba8 Improved greyAllConvervationStatement
I've improved this method, now reward text have they own color when greyed and it only iterate text that not have been greyed yet.
2015-02-26 13:19:26 +01:00
LucasDelvallet
96440f27b0 Old conversation are now grayed out
Old conversation are now grayed out for a better lisibility.
2015-02-09 20:20:48 +01:00
Zukero
0acd31f090 Merge remote-tracking branch 'googlecode/master' 2014-12-21 12:18:03 +01:00
Zukero
3c6da6a1d7 Merge remote-tracking branch 'origin/master'
Conflicts:
	AndorsTrail/AndroidManifest.xml
	AndorsTrail/project.properties
2014-12-02 00:21:05 +01:00
Zukero
d360a55336 Zoom out enabled on in-game world map.
Update to Android 5.0 (API 21)
2014-12-02 00:17:26 +01:00
Ian Haase
917cd5eb77 Small edit of remgard_villagers1 dialogue 2014-10-29 10:29:22 +01:00
Ian Haase
46ef47e0f7 Fixed up some small issues related to the pitch-black mine and the shortcut to the Blackwater Mountain Settlement. 2014-10-29 10:27:22 +01:00
Ian Haase
98a8f396f8 Small update to the Blackwater Mountain fix. A shortcut from the BWM cabin to the Blackwater Mountain settlement can be opened now. And the Prim mine (pitch-black mine) can be opened up as well. 2014-10-28 19:49:45 +01:00
Ian Haase
417b8a9e1c edit of the tileset "map_broken_1". 2014-10-20 18:09:06 +02:00
Zukero
df07c91af4 Attack cost button now updated when equipment changed mid-fight. Thanks
ace for reporting this.
2014-07-24 22:44:31 +02:00
Zukero
37aa751ce7 Merge pull request #2 from noamik/master
Fixed translations for skill "Hard Hit". Merged from github/noamik/andors-trail/master
2014-07-24 21:48:44 +02:00
Ian Haase
6bd1dcf77d Blackwater mountain fix released.
Now this area can be browsed in the world map!
Most of the maps have been edited and four new maps have been created for aligning purposes.
2014-07-24 15:34:45 +02:00
Michael Noack
bf5439d59e Fixes translations of skill description for "Hard Hit" to reflect changes in 0.7.1.
TODO: pt and pt-rBR are wrong as well and need fixing.
TODO: ru, ja and pl need to be checked by translators and be removed in case of doubt to give future translators a chance to fix the translation.
2014-07-01 19:10:49 +02:00
Michael Noack
0e4ad9e201 Revert "Fixes min damage not getting increased as advertised by skill point of skill "Hard Hit"."
This reverts commit 3615fed2e7.
2014-07-01 11:15:28 +02:00
Michael Noack
3615fed2e7 Fixes min damage not getting increased as advertised by skill point of skill "Hard Hit". 2014-06-30 19:08:23 +02:00
Ian Haase
8109170405 Updated the tileset map_cavewall_4. Now it has got additional wall and corner tiles.
Credits go to rijackson741.
2014-06-20 15:58:13 +02:00
Ian Haase
3bdf530beb Added world map which is updated to v.0.7 2014-06-20 11:13:34 +02:00
Ian Haase
da07968222 Edit of map_cavewall_3.png
Credits go to Moerit!
2014-06-08 14:47:10 +02:00
Ian Haase
d190bce37a Fixed up the two tutorial maps. 2014-06-08 10:38:25 +02:00
Zukero
ebdcc6c603 Added res/raw/actorconditions_debug.json, now loaded instead of the
usual ones when AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ==
true.
2014-05-29 00:57:17 +02:00
Zukero
b40cdd5350 Merge remote-tracking branch 'google/master' 2014-05-29 00:43:37 +02:00
Zukero
0454d6fa1d Fixed version control management errors.... 2014-05-29 00:43:23 +02:00
Zukero
e162066be2 Updated launchpad translations on 2014-05-28 22-16 UTC 2014-05-29 00:32:57 +02:00
Zukero
3d3c882ef0 Updated Polish version of strings.xml and xtrings_about.xml. Thanks to
DanielS.
Google issues #354 & #355
2014-05-29 00:20:22 +02:00
Zukero
869c791e76 Fixed bug when loot bags are on mapchange areas.
You will now be able to pick up a bag when you reach the loot bag
without being transported to a new map.
If you are transported to a new map on a loot bag, you will be offered
to pick up this bag.
2014-05-29 00:19:39 +02:00
Ian Haase
6cedd56453 small update on maps:
-shadow corrections
-other small issues
2014-05-15 13:22:15 +02:00
Zukero
7a02014e1b Merge remote-tracking branch 'google/master'
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
2014-04-23 00:47:59 +02:00
Zukero
624bd19aa9 Updated all "strings.xml" translations to remove obsolete lines.
Made worldmap's named areas translatable through launchpad (.mo files)
2014-04-23 00:33:39 +02:00
Zukero
e920ec958e Included latest launchpad versions (2014-04-06) 2014-04-06 19:17:29 +02:00
Zukero
e390490f23 Updated DE strings.xml 2014-04-06 18:58:11 +02:00
Ian Haase
2240a9e26b added "Replace" object layer to the template file 2014-03-30 20:32:47 +02:00
Zukero
916ab8530d Reminder for later added. 2014-03-04 22:50:21 +01:00
Oskar Wiksten
bd27e5d5ab Bump version to v0.7.2dev 2014-03-02 09:30:40 +01:00
Zukero
7f619d03f8 Return to debug mode.... 2014-02-25 00:04:27 +01:00
Zukero
b43f49fbab Bumped version to v0.7.2dev 2014-02-25 00:03:26 +01:00
Zukero
35e3ad024c Bugfix introduced in previous commits. AP Cost (move, reequip & item
use) should have percentage applied when negative and 100% applied when
positive. Those are the only ones where negative value is a bonus to the
player.
2014-02-24 22:52:52 +01:00
Zukero
46d7bdcd87 Added all the missing stats from second-hand weapon to the dual wield
skill effects.
- DR
- AP Boost (or malus)
- Move cost
- Reequip cost
- Use Item Cost
2014-02-24 22:52:52 +01:00
Zukero
253dda89d7 Added missing \n at EOF... 2014-02-24 22:52:52 +01:00
Zukero
1d0f233292 Dual wield skill bugfixes.
(Seen when using a pair of Rapier of Lifesteal) : Adds boost to Max HP
from off-hand weapon (25% for Dual Wield lv 0, 50% for DW lv 1, and 100%
for DW lv 2)

(Seen when using a non-crit weap in the main hand, and a crit one in the
offhand) : Adds boost to Critical chance from off-hand weapon (25% for
DW0, 50% for DW1, 100% for DW2). Set critical multiplier as max of main
hand weapon's CM and off-hand weapon's CM multiplied by {0.25 for DW0,
0.5 for DW1, 1.0 for DW2).
2014-02-24 22:52:52 +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
Oskar Wiksten
0570589ecc Refactor: Rename reset() -> resetForNewGame() on map data classes 2013-10-27 08:38:27 +01:00
Oskar Wiksten
9af062e36e Updated PO translations from launchpad 2013-10-26 11:39:19 +02:00
Oskar Wiksten
9fc23ca1fc Add "translator-credits" to english POT file
* Used by Launchpad translations for maintaining list of translators.
2013-10-26 10:23:12 +02:00
Oskar Wiksten
e509b1d75f Update english.pot, reformat all PO files (sort by source location) 2013-10-26 09:50:18 +02:00
Oskar Wiksten
339c3ee7b2 Renamed Brazilian Portuguese translation file: pt-rBR.po -> pt_BR.po 2013-10-26 09:44:40 +02:00
Oskar Wiksten
0c3b4bded9 Merge pull request #9 from Zukero/requirements_negation
Added requirement negation capability :
2013-10-23 09:22:22 -07:00
Zukero
c06dba6b7d Factorized the checkbox definition in content editor. 2013-10-23 18:08:09 +02:00
Zukero
707940aa14 Added requirement negation capability :
- Use "requireNegation" property in Tiled map object
- Checkbox for require.negate added in Content Editor
2013-10-22 23:10:24 +02:00
Oskar Wiksten
bdde9cefba Merge branch 'activable_map_objects' 2013-10-22 18:06:23 +02:00
Zukero
26c412f7f1 MapObject & MonsterSpawnArea can be activated/deactivated using theisActive boolean.
No handle exist yet to deactivate these areas.
Deactivated areas are never returned by PredefinedMap API.
Inactive container areas' Loot are not created on
createAllContainerLoot() calls. Think of creating it on area activation
when implemented (TODO label placed in the code to never forget :p)
Updated comment; fixed old, one-object processing to better match the
List type.
2013-10-22 18:05:51 +02:00
Oskar Wiksten
159d977187 Merge pull request #7 from Zukero/debug_resources_bugfix
Fixed deprecated use of "consumedMore" instead of "spentGold" in
2013-10-22 06:38:27 -07:00
Zukero
e33ac42c1c Fixed deprecated use of "consumedMore" instead of "spentGold" in
conversationlist_debug.json
2013-10-22 15:18:44 +02:00
Oskar Wiksten
76720094c1 Merge pull request #6 from Zukero/map_object_group_data_kept
MapObject & MonsterSpawnArea now keep track of their Tiled group's name.
2013-10-20 23:39:38 -07:00
Zukero
c4896aaab3 Tiled group name also in ReplaceableMapSection 2013-10-20 22:18:42 +02:00
Zukero
bddb3e2a8c MapObject & MonsterSpawnArea now keep track of their Tiled group's name. 2013-10-20 22:14:35 +02:00
Oskar Wiksten
7f2388904b Minor gfx update to tiling pine trees 2013-10-20 10:30:01 +02:00
Oskar Wiksten
73e8851f27 Bugfix: Redraw whole screen if double-buffer is not pre-filled
* Fixes issue where the screen was only partially drawn after having entered heroinfoactivity before starting combat.
* lockCanvas() changes the supplied Rect object occasionally, to indicate that the double buffer has not been filled. In those cases, you need to redraw the whole rect.
2013-10-20 10:00:20 +02:00
Oskar Wiksten
a0f943994f Bugfix: Continue combat after having seen the combat log
* Previously, combat was stopped when entering the combat log. This commit makes the combat continue after having been stopped.
2013-10-20 09:03:53 +02:00
Oskar Wiksten
518934751b Merge branch 'new_tilesets_20131005' 2013-10-05 17:56:12 +02:00
Ian Haase
36da967dbe updated tilesets + template.tmx and authors.xml 2013-10-05 17:55:57 +02:00
Oskar Wiksten
9812dc6344 Merge pull request #5 from Zukero/master
Egocentric commit. Added my name in the authors...
2013-10-03 13:32:43 -07:00
Zukero
5daf70e739 Egocentric commit. Added my name in the authors... 2013-10-03 22:27:11 +02:00
Oskar Wiksten
0a8859b304 Add explicit quest stages to existing key areas 2013-10-03 08:27:11 +02:00
Oskar Wiksten
3cee7e95d2 Merge branch 'key_area_use_requirements' 2013-10-03 08:26:26 +02:00
Zukero
140dd16408 Key Area now use Requirement, instead of QuestProgress
* Requirement class moved from model.conversation to model.script
* Added requirement questLatestProgress : quest stage must be reached, but no stage with superior ID must be reached.
* New key requirements conditions type (item/gold/bonemeals) consumption (more or less than value, never strict checking, either <= or >=).
2013-10-02 18:21:14 +02:00
Oskar Wiksten
9af294932f Remove unused code 2013-09-25 22:30:10 +02:00
Oskar Wiksten
5136a7cab0 Merge branch 'headless-scripts' 2013-09-25 17:55:25 +02:00
Oskar Wiksten
b41fffee44 Content editor: Add support for giveItem,createTimer and timerElapsed in convs 2013-09-25 17:54:08 +02:00
Oskar Wiksten
0212dd6bbc Add world timers and world time (counted in number of rounds)
* Increase world time each round.
* Add script reward "createTimer"
* Add script requirement "timerElapsed"
2013-09-25 17:54:08 +02:00
Oskar Wiksten
d6583a4e33 Add reward type "giveItem", for quest rewards that do not need full droplists. 2013-09-25 17:54:08 +02:00
Oskar Wiksten
02bfeb5625 Enable map scripts to run on every round or tick 2013-09-25 17:54:08 +02:00
Oskar Wiksten
dc278fb5da First attempt at scripted map areas 2013-09-25 17:54:08 +02:00
Ian Haase
8d91c7375d recolored dirt transitions 2013-09-25 17:47:10 +02:00
Oskar Wiksten
d13cd4c02a Add preference "use localization", to allow disabling partial translations 2013-09-08 16:56:03 +02:00
Oskar Wiksten
787fcc0a65 Rearrange worldmap.xml (sort by name) 2013-09-02 20:45:53 +02:00
Oskar Wiksten
d29218c7c3 Prepare data placeholder "worldData". 2013-08-31 19:28:09 +02:00
Oskar Wiksten
9c78b6a2ec Refactor player combat round methods 2013-08-31 19:21:37 +02:00
Oskar Wiksten
96d451ffbe Worldmap tile alignment (awesome work by Tomcat!) 2013-08-30 21:04:08 +02:00
Oskar Wiksten
2dfed6847c Content editor: Display phrase rewards and replies as divs instead of table 2013-08-27 22:54:23 +02:00
Oskar Wiksten
0992053a72 Bugfix: Realign tiles in Fallhaven (thanks Mayweed & Tomcat) 2013-08-24 17:05:38 +02:00
Oskar Wiksten
a1da45ce3f Refactor: Changed namespaces, reorganized imports. 2013-08-24 13:51:59 +02:00
Oskar Wiksten
89a64bbdea Content editor: Add support for switching active NPC in dialogue 2013-08-20 20:42:12 +02:00
Oskar Wiksten
06feff98c1 Update Elwyl/Elwel conversation to switch active NPC 2013-08-20 20:42:12 +02:00
Oskar Wiksten
8611148530 Conversations with more than one NPC
* Add "switchToNPC" property on phrases, that should contain the monsterTypeID of the NPC that should tak over the dialogue.
2013-08-20 20:42:12 +02:00
Oskar Wiksten
126eb49e10 Use long param names when starting local Content Editor 2013-08-20 20:41:34 +02:00
Oskar Wiksten
f620ca924e Bugfix: Exclude hidden quests from completed quests statistics (thanks jlhromeo!) 2013-08-20 19:45:39 +02:00
Oskar Wiksten
fb1782bb7e Conversation spelling corrections (thanks LoveToFlyGuy!) 2013-08-19 20:06:13 +02:00
Oskar Wiksten
a87605661b Merge branch 'master' of https://code.google.com/p/andors-trail 2013-08-19 20:01:52 +02:00
Oskar Wiksten
0bcd41b2ef Waterfall tiles (thanks red hatter!) 2013-08-19 20:01:04 +02:00
Ian Haase
73894752f2 added a new tutorial called "Advanced Mapmaking". 2013-08-17 13:13:01 +02:00
Ian Haase
32a3d9c964 Updated map editor tutorial 2013-08-16 12:28:23 +02:00
Ian Haase
5bff7c79d2 Revert "Update on the Map Editor wiki: http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section:map_editor"
This reverts commit dd6431cb1b.
2013-08-16 12:05:15 +02:00
Ian Haase
dd6431cb1b Update on the Map Editor wiki: http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section:map_editor 2013-08-16 12:02:16 +02:00
Oskar Wiksten
b810a6e91e Add monster movement type 'wholeMap'.
* Monsters with this movement type can even move outside their own spawn areas.
2013-08-08 17:14:48 +02:00
Oskar Wiksten
16e8a5fdbe Bugfix: only use pathfinder for monsters that are aggressive 2013-08-08 11:31:06 +02:00
Oskar Wiksten
a83271c3a9 Bugfix: Show correct ingreds for Lodar def pot in the quest log (Thanks jamnjim358) 2013-08-05 10:54:27 +02:00
Oskar Wiksten
b6c2beb348 Bugfix: Clear temporay combat state when loading game
Fixes issue with not being able to attack in combat after having exited combat during monster's attack animation.
2013-08-05 10:27:17 +02:00
Oskar Wiksten
3b938c3a0a Refactor: Use more enums instead of const ints 2013-08-05 10:17:14 +02:00
Oskar Wiksten
98f6cd0f97 Bugfix: Redraw everything once initially
* Fixes issue with black screen during combat on Android >= 4.2
2013-08-05 09:32:03 +02:00
Ian Haase
fcabb356ce Updated scarydungeon1. 2013-08-04 10:48:48 +02:00
Oskar Wiksten
7486e130f8 Renamed mapmaking tutorial map 2013-08-03 11:58:05 +02:00
Oskar Wiksten
8bb663a739 Update version to v0.7.1dev 2013-08-03 11:56:49 +02:00
ian.haase2
784df46fb5 Updated scarydungeon1 map. 2013-07-29 17:43:01 +00:00
Oskar Wiksten
918aeaedb3 Bump version to v0.7.0 (versioncode 39) 2013-07-23 18:12:42 +02:00
Oskar Wiksten
83d2a8bde0 Convert all code spaces to tabs.
* Yay for spaces-vs-tabs flamewar!
* Also removes trailing whitespaces in code
2013-07-23 16:36:26 +02:00
Oskar Wiksten
a54d0fd6e8 Bugfix: Load all icons for monsters spawned on maps, even when they're not part of the list of monsters that may spawn on maps 2013-07-23 13:46:10 +02:00
Oskar Wiksten
3523d0105c Update quest to state animal 'hair' instead of 'fur' (Thanks Sarumar) 2013-07-23 13:10:14 +02:00
Oskar Wiksten
8d719b4083 Update v070 maps/conversations after the Hirazinn has been killed 2013-07-23 13:04:51 +02:00
Oskar Wiksten
a2d9e20d3d Map tile alignment tweaking (thanks Tomcat!) 2013-07-23 11:51:17 +02:00
Oskar Wiksten
1b995e7af4 Bump version to v0.7.0a5 2013-07-20 11:54:06 +02:00
Oskar Wiksten
0bd2a820c7 Add % or "percentage points" to some skill descriptions (thanks Antison!) 2013-07-18 17:11:21 +02:00
Oskar Wiksten
a87629c925 Allow Charwood quest to progress without choosing skills 2013-07-18 16:53:36 +02:00
Oskar Wiksten
1baa787533 Minor tile changes to BWM maps 2013-07-18 15:35:36 +02:00
Oskar Wiksten
b28d896600 Add bars to the Charwood mine entrance when the player first visits 2013-07-18 14:05:37 +02:00
Oskar Wiksten
9fab58f239 Slightly shorter setting names for "Show loot dialog" (thanks Tomcat!) 2013-07-18 13:50:29 +02:00
Oskar Wiksten
656dd23407 Provide explicit buffer size when reading huge translation files 2013-07-18 13:14:19 +02:00
Oskar Wiksten
24e1aab8be Minor fix for Portuguese(BR) translation. 2013-07-18 10:15:41 +02:00
Oskar Wiksten
b13caa40b0 Bugfix: Update "attack" button to "move" when fleeing. 2013-07-16 23:13:50 +02:00
Oskar Wiksten
3f9cf63463 Bump version to v0.7.0a4 2013-07-16 10:45:25 +02:00
Oskar Wiksten
c24c264f1e Bugfix: auto-hide quickslots when displaying worldmap and preferences.showQuickslotsWhenToolboxIsVisible = true 2013-07-16 10:45:15 +02:00
Oskar Wiksten
919132a564 Minor stats change to v070 mobs 2013-07-16 10:39:32 +02:00
Oskar Wiksten
c7cd8e6d17 Map tile alignment tweaking (thanks Tomcat!) 2013-07-16 09:39:53 +02:00
Oskar Wiksten
5e1f91bad4 Changing all const ints to enums, making the json resource files much easier to read
* Though, the json files will get a bit larger.
2013-07-16 02:35:59 +02:00
Oskar Wiksten
b4f7d1fe42 Add more requirement types to phrase replies: "killed monster" & "skill level" 2013-07-15 20:52:00 +02:00
Oskar Wiksten
3b70013a98 Provide options of mixing potions in x5 and x10 quantities at Lodar and the Fallhaven potion maker 2013-07-15 20:25:27 +02:00
Oskar Wiksten
2002b1a668 Update conversations to make use of the multiple requirements per reply
* Some previous conversations used several scripted phrases to remove more than one item type. Now that we can remove multiple item types with one phrase, we can just combine all those.
2013-07-15 19:59:47 +02:00
Oskar Wiksten
d05baa266e Update conversations with requirements into using the array-based requirements 2013-07-15 18:36:40 +02:00
Oskar Wiksten
cf9b485971 Modify Reply quest- & item requirements into an array of requirements 2013-07-15 18:36:05 +02:00
Oskar Wiksten
dfe7fde7e3 Refactor JSON array parser to not create as many "new ArrayList<>" instances 2013-07-15 16:38:28 +02:00
Oskar Wiksten
9dafe1f410 Change hard hit to 0-2 dmg instead of 1-1. 2013-07-15 15:24:10 +02:00
Oskar Wiksten
f207ad3990 Bugfix: Only decrease HP by 1 (and not 3) when full health and having sustenance+food poison
* Apply negative effects first (for example, food poison), so that the positive effect (for example, sustenance) can have some effect.
2013-07-15 13:49:47 +02:00
Oskar Wiksten
44511650a1 Map tile alignment tweaking (thanks Tomcat!) 2013-07-15 11:33:01 +02:00
Oskar Wiksten
7b1980a8e3 Minor change to dialogue of Umar in Fallhaven thieves guild. 2013-07-15 10:53:49 +02:00
Oskar Wiksten
f5dc0c877b Add quest "Taste is everything" for making antidotes 2013-07-15 10:44:52 +02:00
Oskar Wiksten
66efb43925 Spelling corrections (Thanks Pyrizzle) 2013-07-14 18:41:29 +02:00
Oskar Wiksten
815dd91219 Map tile alignments (thanks Tomcat!) 2013-07-13 16:06:03 +02:00
Oskar Wiksten
ad041e0b01 Bugfix: Do not redraw tiles outside mapview area when running visual effects 2013-07-13 13:31:55 +02:00
Oskar Wiksten
ac90febeb1 Add setting "Show quickslots when toolbox is opened" 2013-07-13 13:00:14 +02:00
Oskar Wiksten
11c154f5df Only reset timers for rounds after combat ends, and not when changing maps.
* Previously, if you started conversation, entered some other activity or dialog, the round timers were reset each time, making the rounds less likely to happen.
2013-07-13 11:35:03 +02:00
Oskar Wiksten
f9902799f9 Map tile alignment tweaking (thanks Tomcat!) 2013-07-11 21:39:42 +02:00
Oskar Wiksten
afb7f1e12d Fix warning about leaked window from LoadingActivity
* Removes this warning: "WindowLeaked: Activity com.gpl.rpg.AndorsTrail.activity.LoadingActivity has leaked window com.android.internal.policy.impl.PhoneWindow$DecorView"
2013-07-10 21:23:08 +02:00
Oskar Wiksten
10f95613e2 Updated translations with missing strings from questlist.json 2013-07-09 19:30:27 +02:00
Oskar Wiksten
c51952186c Possible bugfix for NPE on hero&shop screens on droid2.1 (thanks Mayweed!) 2013-07-08 23:33:17 +02:00
Oskar Wiksten
3061b9a333 Remove crit. hit immunity from undead. Add crit. hit immunity to constructs. 2013-07-07 18:12:20 +02:00
Oskar Wiksten
41e9c747f1 Bump version to v0.7.0a3 2013-07-07 16:23:15 +02:00
Oskar Wiksten
b0e37131dc Add description to RoLS 2013-07-07 16:23:06 +02:00
Oskar Wiksten
649eac87c7 Add CS to 2handed weapons with CM 2013-07-07 16:22:46 +02:00
Oskar Wiksten
100f091ea9 Updated english.pot 2013-07-07 15:50:48 +02:00
Oskar Wiksten
f797a5bb32 Map alignment tweaks (thanks Tomcat!) 2013-07-07 15:26:55 +02:00
Oskar Wiksten
d0f387268e Slight bump to heavy armor skill 2013-07-07 14:42:57 +02:00
Oskar Wiksten
b3784b6b4b Bugfix: Show loot dialog box even if no monsters dropped anything 2013-07-06 16:46:47 +02:00
Oskar Wiksten
bf94eee299 Changed all <string-array> into referencing @string/ values
* Will make translation easier when adding new items in existing string arrays.
2013-07-06 16:19:24 +02:00
Oskar Wiksten
a0b31542e4 Add more settings to control how loot bags are presented 2013-07-06 15:09:46 +02:00
Oskar Wiksten
8db91f0970 Minor content fixes to v070 content
* Thanks to only1doug, Antison, sorrow, Mety, SkrikRunkarN, Sarumar, Mayweed
2013-07-06 12:59:47 +02:00
Oskar Wiksten
146c4b795a Bugfix: Only remove one item per click when picking up single items from ground bags 2013-07-06 12:05:03 +02:00
Oskar Wiksten
daec6ee814 Basic UI styling for game statistics 2013-07-06 11:02:13 +02:00
Oskar Wiksten
4ead45744e Added game statistics to hero overview screen 2013-07-06 01:01:49 +02:00
Oskar Wiksten
f16149bccb Start using FragmentActivity & FragmentTabHost for tabs instead of TabHost. 2013-07-05 22:26:15 +02:00
Oskar Wiksten
3dcc608cc1 Add rapier item category to 1h sword proficiency skill 2013-07-02 22:02:21 +02:00
Oskar Wiksten
65419b40b1 Bump version to 0.7.0a2 (versioncode 38). 2013-07-02 01:03:59 +02:00
Oskar Wiksten
45b7a0e9a8 Minor cosmetic changes to v070 maps and content.
* Thanks Mayweed!
2013-07-02 00:58:16 +02:00
Oskar Wiksten
07ad3b37b7 Fix newlines in po translation files. 2013-07-02 00:40:14 +02:00
Oskar Wiksten
81aebe0ba9 Updated english.pot according to v0.7.0 minor changes. 2013-07-02 00:40:00 +02:00
Oskar Wiksten
f0b7d78df1 Slight bump to Hira'zinn stats. 2013-07-01 23:18:21 +02:00
Oskar Wiksten
26ccfee924 Bugfix: Do not set a new combat target after running animation when combat has ended. 2013-07-01 23:00:39 +02:00
Oskar Wiksten
fd2014a697 Add warning on the startscreen about savegames in alpha- and beta version. 2013-07-01 20:09:00 +02:00
Oskar Wiksten
c4908630c3 Change "weapon proficiency"-skills to adding %ac,%bc,%cs instead of fixed values
* Also, lower "weapon and shield" and "2hand style" slightly.
2013-07-01 19:15:38 +02:00
Oskar Wiksten
2deb8ee7ac Bugfix: Save spawned monsters on current map after having rested there. 2013-06-30 16:37:36 +02:00
Oskar Wiksten
341f27351a Remove quest "lodar13_rest" from questlog if player attacks both parties 2013-06-30 14:39:54 +02:00
Oskar Wiksten
d5acf6b842 Make Charwood goblins more visible. 2013-06-30 13:53:39 +02:00
Oskar Wiksten
6aa8eeb760 Bugfix: Do not display double loot msgs about picked up gold.
* Also, refactor the loot popups to display toast even when the monster does not drop anything. (Should still display the exp)
2013-06-30 13:24:25 +02:00
Oskar Wiksten
aa6a0baec6 Nerfing the Xul'viir. 2013-06-30 01:00:01 +02:00
Oskar Wiksten
9f412d02d4 Spelling corrections for v0.7.0. 2013-06-29 23:45:23 +02:00
Oskar Wiksten
08aa1b041b Bugfix: Correctly restore conversation history after rotating device 2013-06-29 19:43:11 +02:00
Oskar Wiksten
8527b3a7c0 Fall back to using old worldmap filenames when displaying worldmap and new filenames does not exist. 2013-06-29 18:41:21 +02:00
Oskar Wiksten
8ac12ac960 Add preferences for setting position of quickslots 2013-06-29 18:11:07 +02:00
Oskar Wiksten
7eeab282b7 Bugfix: Do not emit onActorConditionRoundEffectApplied when an actor condition doesn't have any effect. 2013-06-29 17:28:11 +02:00
Oskar Wiksten
0bcf9730e2 Bugfix: Allow returning to conversation with Maevalia after giving Thukuzun quest item. 2013-06-29 17:24:23 +02:00
Oskar Wiksten
23d8cafad2 Bugfix: Dual-wielding negative effects & atk cost
* Dual-wielding items with negative effects should give 100% of the negative effect.
* Also apply atk cost effects of other items when dual-wielding.
2013-06-29 16:25:25 +02:00
Oskar Wiksten
db6539744b Add wild14_clearing to worldmap (thanks TomCat!) 2013-06-29 11:58:04 +02:00
Oskar Wiksten
25beb2638e Bump version to v070a1 2013-06-27 21:15:00 +02:00
Oskar Wiksten
7b136560e9 Converted all translated resources to .po format. 2013-06-27 21:02:42 +02:00
Oskar Wiksten
c6b57db426 Merge branch 'v070content' into v070 2013-06-27 20:45:29 +02:00
Oskar Wiksten
b95011b5d4 Minor fixes to v070 content. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
3776b33deb Minor fixes to v0.7.0 content after gameplay feedback. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
7d386240a1 Make tradehouse0 use replacement area instead of key area. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
0d3efd84ed Minor fixes to v070 content. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
f4d2438a2e Minor fixes for v070 content. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
91c22586a1 Spelling corrections for v070 quests. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
94b778af2b Populating shops for v070. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
32df0fd717 Finishing up Charwood and Lodar quests. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
7088faaf8a Populating lostmine* maps with monsters. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
33b8d4fe3a Populating charwood* and lodar* maps with monsters. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
dcd8337ff3 Added conversations, monsters, quests for v070. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
53fbe550aa Align mapchange areas roadbeforecrossroads1->roadbeforecrossroads2. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
58a14d3e58 Added tradehouse0a map (basement in Charwood cabin). 2013-06-27 20:45:17 +02:00
Oskar Wiksten
3a67a6af6a Updated lodar* maps with signs needed for the Lodar quest. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
bda06f990b Update roadbeforecrossroads1 to match the description Ogam gives 2013-06-27 20:45:17 +02:00
Oskar Wiksten
c49bedb7fd Updated worldmap.xml according to lodar* maps. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
3df824bfb2 Updated lodar* maps with new tileset. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
df02938766 Spelling correction "Foaming Flask Tavern". 2013-06-27 20:45:16 +02:00
Oskar Wiksten
15cf74359e Moved a lot of tiles to the correct layers and updated tile walkable state on a lot of tiles. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
158d015f1e Updated worldmap.xml 2013-06-27 20:45:16 +02:00
Oskar Wiksten
c87d31ec9c Added worldmap.xml 2013-06-27 20:45:16 +02:00
Oskar Wiksten
6649754e1f Cosmetic mapchanges. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
c1ed9d2ffa Minor changes to lodarhouse map. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
3d8090ad13 Make lodar* maps outdoor maps. Align lodar* and roadbeforecrossroads* maps to worldmap. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
d62d2e6603 Updated lodarcave* maps (thanks Ian Hasse). 2013-06-27 20:45:16 +02:00
Oskar Wiksten
8cdcbdc75d Updated lostmine* maps.
Added tradehouse* maps to loadresources.
Made all tiles of all mapchange areas walkable.
2013-06-27 20:45:16 +02:00
Oskar Wiksten
4aeb88bf9a Added tradehouse* maps for v0.6.12. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
6dc31e42e9 Minor adjustments to maps for v0.6.12 2013-06-27 20:45:16 +02:00
Oskar Wiksten
96ddc508a3 Aligned lodar* and roadbeforecrossroads* maps to fit into worldmap. Updated sizes of mapchange areas.
Updated worldmap with new maps.
2013-06-27 20:45:16 +02:00
Oskar Wiksten
dca9117a3f Corrected misspelled monster ids on new maps for v0.6.12. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
ac42088c03 New maps for v0.6.12 from Ian Haase. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
68de0fc9a9 Added items for v0.7.0 2013-06-27 20:45:15 +02:00
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
Oskar Wiksten
bb953f9512 Minor fixes for reading slightly borked resource files. 2013-05-29 22:04:39 +02:00
Oskar Wiksten
fa8c31e695 Store list of maps in savegames as map<string> instead of indexed list.
* Do not store maps that have been visited or that have been reset.
* Reduces savegame filesize from ~83k to ~30k.
* Removes dependency on loading maps in a certain order (better for future refactorings).
2013-05-26 13:40:57 +02:00
Oskar Wiksten
cb6f84d2df Bugfix: Allow conversation options for "Feygard errands" in Vilegard even when the Vilegard quest has not been completed. 2013-05-19 18:16:23 +02:00
Oskar Wiksten
1df5d183dc Bugfix: Apply checks for whether the player can select replies on single "next" replies as well. 2013-05-12 13:14:08 +02:00
Oskar Wiksten
348b74ad7b Added worldmap alignment maps (thanks to Tomcat!) 2013-05-06 23:34:53 +02:00
Oskar Wiksten
53e10680fa Teleports in Throdna's throne room are only accessible by one way.
* Force the player to step on the sign tile before accessing the teleporters in the BWM throne room.
2013-04-21 21:05:34 +02:00
Oskar Wiksten
52c7cc5acc Content editor: Add hierarcical view of conversation phrases and replies. 2013-04-06 12:30:07 +02:00
Oskar Wiksten
729a2c98b7 Content editor minor fixes. 2013-04-01 14:50:45 +02:00
Oskar Wiksten
50cd3c20af Content editor: add column to monster table editor to view hit effects. 2013-03-31 18:07:16 +02:00
Oskar Wiksten
a29ebb466b Bugfix: change combat selection when a monster dies from a condition in combat. (thanks to Fala from the forums for finding it!) 2013-03-29 22:55:53 +01:00
Oskar Wiksten
bb314eea66 Raise taunt chance to 75%. 2013-03-29 22:44:27 +01:00
Oskar Wiksten
c8de0c8f77 Minor bugfixes to resource loaders
* Fail harder when TileManager hasn't allocated enough tiles for the preloaded icons.
* Minor tweak to misplaced tile on hauntedhouse3
* Weaken "strength" condition (prefer to control effect through magnitude instead)
* Load icons for "items_weapons_2".
* Do not require items to have "base market cost" (for example, when they are automatically priced)
2013-03-29 20:03:33 +01:00
Oskar Wiksten
84d01e1aed Content editor: Add "previous"/"next" buttons in editors for items, monsters and actor conditions. 2013-03-27 20:15:02 +01:00
Oskar Wiksten
dd51f5de6c Updates to content editor
* Do not reset store prices on items when changing between manual and automatic pricing.
* Correct urls on import/export pages to where the files are placed.
* Show indications in item table editor on effects that cause actor conditions.
2013-03-27 19:35:56 +01:00
Oskar Wiksten
5cb762113d Added more monster icons from the TomeTik set. 2013-03-17 14:28:16 +01:00
Oskar Wiksten
993ec1d194 Conste editor: Add "Add" button at the bottom of the table editor. 2013-03-16 13:13:13 +01:00
Oskar Wiksten
11c301a24c Content editor: Remember displayed columns in table editors when changing pages. 2013-03-16 12:29:53 +01:00
Oskar Wiksten
9a5cf33108 Add automatic cost calculations for items that have hit- or kill-stats that affect HP or AP. 2013-03-16 10:38:19 +01:00
Oskar Wiksten
c2de054cf5 Add automatic cost calculations for items that have "increase use item cost" or "increase reequip cost"-stats. 2013-03-16 10:00:28 +01:00
Oskar Wiksten
bea69f06bf Content editor: Only enable item's "has equip effects" if the item category is wearable. 2013-03-16 09:45:15 +01:00
Oskar Wiksten
626c558335 Content editor: Move reusable logic functions for calculating item cost & monster exp to separate js file. 2013-03-16 09:45:14 +01:00
Oskar Wiksten
73efe5e62b Content editor: Change name of js libraries folder "inc"->"lib". Add favicon image. Close icon selector dialog by pressing escape button. 2013-03-16 09:45:13 +01:00
Oskar Wiksten
7d09202329 Bugfix content editor: treat number fields as numbers (and not strings) when calculating monster experience. 2013-03-10 13:40:42 +01:00
Oskar Wiksten
24c15a798a Bugfix: Read critical multiplier for weapons as float instead of int. 2013-03-10 13:18:18 +01:00
Oskar Wiksten
eb3f3f989d Bugfix: When exporting strings that start with a number (such as "2hsword"), only do integer conversion in the resulting JSON if the whole value is a number. 2013-03-09 23:45:38 +01:00
Oskar Wiksten
1cc20839ff Added some tiles for crates and stairs, from opengameart.org. 2013-02-24 18:18:37 +01:00
Oskar Wiksten
07bbe7dd9e Added lots of new tiles for monsters, items and effects from opengameart.org. 2013-02-24 17:25:23 +01:00
Oskar Wiksten
cc4827b1bd Refactor conversations to state machine - Move responsibility for starting combat & removing npcs from map from MainActivity into the ConversationController. 2013-02-22 14:10:05 +01:00
Oskar Wiksten
9fd5508070 Refactor conversations to state machine - minor bugfixes for "next" button disabling. 2013-02-22 14:09:31 +01:00
Oskar Wiksten
2da410118e Only notify rewards in conversation if there actually are any. 2013-02-22 12:14:59 +01:00
Oskar Wiksten
e965afc699 WIP move conversation logic to ConversationStatemachine - bugfix for selecting replies with requirements. 2013-02-21 14:29:25 +00:00
Oskar Wiksten
37ae3b6c69 WIP moving conversation flow logic from Activity to testable state machine. 2013-02-20 16:07:01 +00:00
Oskar Wiksten
6261c499ff Renamed "ViewContext" -> "ControllerContext" to better reflect its responsibility. 2013-02-20 15:30:53 +00:00
Oskar Wiksten
f5ff29a0fe Refactored results of phrase rewards, in preparation of displaying more results when gaining rewards. 2013-02-18 07:43:38 +00:00
Oskar Wiksten
24ab3b95f0 Updated IntelliJ Idea project file to work with any Android API version. 2013-02-15 15:14:49 +00:00
Oskar Wiksten
8575e89dee Update R.layout.inventoryitemview to a single TextView instead of a combined ImageView & TextView. 2013-02-15 12:04:05 +00:00
Oskar Wiksten
9bb1e73f07 Reduce compilation warnings from code inspection rules.
(Reduce visibilities to private, add final where applicable)
2013-02-15 09:59:57 +00:00
Oskar Wiksten
59df54f1bb Remove compilation warnings about showDialog() and removeDialog() being deprecated. 2013-02-15 07:50:45 +00:00
Oskar Wiksten
a8b21461de Minor refactoring CombatController. 2013-02-14 14:57:40 +00:00
Oskar Wiksten
f16cfa3ab0 Remove compilation warnings about "new BitmapDrawable(Bitmap)" being deprecated. 2013-02-14 14:57:00 +00:00
Oskar Wiksten
d2428ad36c Add IntelliJ Idea project file.
Add Android v4 support library.
2013-02-14 14:47:46 +00:00
Oskar Wiksten
91015e5ea7 Rearrange .gitignore. 2013-02-14 14:47:09 +00:00
Oskar Wiksten
668993c01b Add clear() method to event listener queues. 2013-02-13 15:31:11 +00:00
Oskar Wiksten
2bc06041ad Remove trailing spaces in some conversation phrase texts. 2013-02-12 13:58:46 +00:00
Oskar Wiksten
fb45d7e372 Add support for "description" field on items, for lore/background text that should be displayed on the item. 2013-02-11 11:10:00 +00:00
Oskar Wiksten
48d93fbbd0 Only apply "more criticals" skill if the player has CS>0. (Thanks to TriangleGM for reporting it!) 2013-02-09 17:02:33 +01:00
Oskar Wiksten
a32595c645 Refactor content editor - Correct spelling on tooltips. 2013-02-09 12:42:01 +01:00
Oskar Wiksten
370c62dc65 Merge branch 'revamped_editor' 2013-02-09 12:35:30 +01:00
Oskar Wiksten
4476d77a73 Refactor content editor - Added hints for most editable fields. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
cfeffe45f5 Refactor content editor - remove unused files. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
dadf68da42 Refactor content editor - Updated description for "isStacking" on actor conditions. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
059a68ddbe Refactor content editor - Minor layout issue on item table editor. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
7dbbcc45d0 Refactor content editor - Minor layout issue on item table editor. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
a3ff6fb722 Refactor content editor - Add table editor for items. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
09d4d39fe5 Refactor content editor - Provide table-based editor for monsters. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
7ef0152e4c Refactor content editor - Simplify item cost calculations. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
9f9d1ae5d5 Refactor content editor - Simplify monster exp calculation. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
d08af3a089 Refactor content editor - Removed old files. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
4a4450d20d Refactor content editor - Remove conversation tree. Provide links to follow conversation topics. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
8ec233096a Refactor content editor - Display (buggy) treeview for editing conversation phrases. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
f2b9e6a9f3 Refactor content editor - Reorganized files into separate directories. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
feb05838f8 Refactor content editor - work in progress on editor for dialogue. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
30d8cb3a0d Refactor content editor - Allow loading resources from existing json files. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
948bd2c215 Refactor content editor - Actually remove things from model when pressing "remove". 2013-02-09 12:35:17 +01:00
Oskar Wiksten
889c607f9a Refactor content editor - provide hovering hint on clickable icons. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
bb33261d21 Refactor content editor - Enable popup to select icon for items, monsters and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
d1412d8c9d Refactor content editor - Handle unique monsters correctly. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
f9e0a3e591 Refactor content editor - display icons of items, monsters and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
cc0ff7bdb1 Refactor content editor - Remove unused files. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
3dfd070d0b Refactor content editor - More basic styling on import/export. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
5970a584f5 Refactor content editor - More baic styling 2013-02-09 12:35:16 +01:00
Oskar Wiksten
aa9480448d Refactor content editor - Basic ui styling 2013-02-09 12:35:16 +01:00
Oskar Wiksten
8f73b28979 Refactor content editor - Hide some item fields on standard layout. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
1d712006df Refactor content editor - Use default values correctly. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
d54c1ab6f8 Refactor content editor - Add support for loading actual content with http get. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
f80157a0d0 Refactor content editor - Add support for editing items and item categories. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
8570d4d760 Refactor content editor - Add support for editing droplists. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
c33cd6bd2a Refactor content editor - Added views for updating, exporting and importing quests and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
004a67f2c9 Refactor content editor - More work on default values for import/export. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
b9d36db162 Refactor content editor - Updated editor to use module pattern. Implemented import/export of json formats. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
6d05129384 Work in progress on updated Content editor that uses angular.js instead of jqueryui. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
bc1fb7daa5 Merge branch 'resource_as_json' 2013-02-09 12:34:57 +01:00
Oskar Wiksten
52a5b8f387 Converted all resource files to json instead of our previous custom format. 2013-02-09 12:34:03 +01:00
Oskar Wiksten
76eaf13772 Minor fix to loading json files from raw/. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
8e75512cfa Fixes to JSON parsing of resource files. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
9ff01745d0 Read JSON resources from raw/ folder instead of encoded in string blocks from values/ folder. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
89759f77f4 Updated parsers for reading resources as JSON. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
81665520c0 WIP on parsing resource data as json instead of the old resource format. 2013-02-09 11:10:29 +01:00
Oskar Wiksten
4b8577e690 Increased exp reward for most quests tenfold. (Issue 283, thanks to jrozek!) 2013-02-09 11:08:27 +01:00
Oskar Wiksten
3bbd38548f Updated Polish translation by tobik9090siemens. 2013-02-09 09:10:46 +01:00
Oskar Wiksten
f358741d99 Merge branch 'healfood' 2013-02-06 07:54:22 +00:00
Oskar Wiksten
3da6d0808c Updated translations of itemlist with changes to how food is healing. 2013-02-06 07:53:37 +00:00
Oskar Wiksten
7a3e167bc5 Bugfix: Food poisoning should have an effect every round. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
429429e63f Doubled the amount of health provided by all food items. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
7c38e0337d Changed all food to slowly heal over time instead of healing instantaneously. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
d0552dad83 Merge branch 'updated_tileset' 2013-02-03 10:37:45 +01:00
Oskar Wiksten
fbe7312e1c Updated maps from master. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
278c605bdb Updated some map tiles. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
eb8232af1f Updated tileset map_wall_1 2013-02-03 10:34:16 +01:00
Oskar Wiksten
ff3fb12a50 Updated tile size for cave walls. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
91fc3a7745 Updated tmx files with new tileset files. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
2ecd64c003 Updated map tileset image files. Updated template.tmx . 2013-02-03 10:31:50 +01:00
Oskar Wiksten
939a406b88 Realign waterway2 & waterway4 on worldmap. 2013-02-03 10:00:01 +01:00
Oskar Wiksten
3e5f77d891 Updated copyright notice to "2010-2013". 2013-02-02 13:56:26 +01:00
Oskar Wiksten
c4a10c5d7d Updated German translation from SamuelPlentz.
(From issue 331)
2013-02-02 13:25:29 +01:00
Oskar Wiksten
7d5084312a Updated list of authors with Polish translator tobik9090siemens. 2013-02-02 13:16:38 +01:00
Oskar Wiksten
8f5c35fabb Updated Russian translation from istasman.
Added istasman to list of authors for Russian translation.
(From issue 332 and issue 333)
2013-02-02 13:11:53 +01:00
Oskar Wiksten
8f3a22beb4 Changed visibility of methods used in unit tests. 2013-01-28 01:30:37 +01:00
Oskar Wiksten
109fb5ecfb Merge branch 'refactor_listener' 2013-01-28 01:27:31 +01:00
Oskar Wiksten
159bc8799f Merge branch 'actortraits_refactoring' 2013-01-28 01:27:20 +01:00
Oskar Wiksten
33345acabd Add public visibility for methods used in unit tests. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
215dd4e31f Updated .gitignore 2013-01-28 01:25:54 +01:00
Oskar Wiksten
be2e54978d Refactor: moved "Savegames" class into savegames package. Moved ListOfListeners into util package. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
16a69bf48c Bugfix: clone list of monster loot bags when picking up items (prevents double drops). 2013-01-28 01:25:54 +01:00
Oskar Wiksten
ad36da6418 Code cleanup: make classes final where possible. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e3406df935 Emit "new map" events on calling thread, and not inside the async maploading handler. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e2446d153e Only redraw game screen when something inside the view has actually changed. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
1032b2ee51 Provide reference to current map object when emitting monster spawned events. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
6a59f5d99e Use correct previousPosition when moving monsters. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
5d437db461 Use WeakReference<> for references to application instance. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
32e9a92fef Work in progress on moving ui dependencies away from model. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e3ea3342c5 Work in progress on moving UI dependencies into being pubsub instead of direct calls from model->ui. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
a99b0fc96f Initialize Player & Monster health correctly when respawning either one. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
a50c1a1279 Actor traits refactoring - Reworked UI for displaying the actor stats tableview. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
2ac6762f2f Actor traits refactoring - Remove ActorTraits & CombatTraits. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
2770d2156f Actor traits refactoring - Make sure Monster and Player objects are serialized and deserialized correctly. Cleanup dead code. 2013-01-28 01:01:23 +01:00
Oskar Wiksten
ca4ad69f36 WIP 6 - Moved around lots of properties. 2013-01-28 01:01:23 +01:00
Oskar Wiksten
be5298c247 WIP 5 refactor actor traits - Moved name & tileSize from ActorTraits to Actor. 2013-01-28 00:59:23 +01:00
Oskar Wiksten
844afc2a95 WIP 4 actor traits refactoring - Created savegame loaders for pre-versioncode-33. 2013-01-28 00:59:23 +01:00
Oskar Wiksten
21fca91ca7 WIP 3 refactoring actor traits - moved iconID && tileSize to Actor. 2013-01-28 00:59:23 +01:00
Oskar Wiksten
bf809df44f WIP 2 moved fields from ActorTraits onto ActorTraits. 2013-01-28 00:59:22 +01:00
Oskar Wiksten
81c2c2bc40 WIP 1 renamed Actor.actorTraits -> Actor.baseTraits. Added BaseTraits to MonsterType. 2013-01-28 00:59:22 +01:00
Oskar Wiksten
ae99a66e28 Updated .gitignore with files produced by IntelliJ Idea. 2013-01-28 00:44:18 +01:00
Oskar Wiksten
e02e55d041 Merge branch 'production' 2013-01-28 00:42:17 +01:00
Oskar Wiksten
4af99e3d21 Merge branch 'master' of https://code.google.com/p/andors-trail 2013-01-28 00:41:38 +01:00
Oskar Wiksten
6d2b97d8d2 Bugfix - Prevent force-close when a monster dies from a lingering actor condition (issue 336). Thanks to Xero from the forums for finding the bug! 2013-01-28 00:39:49 +01:00
Scott Devaney
4ed1bcb445 Updated Polish translations by tobik9090siemens 2013-01-27 18:21:22 -05:00
unknown
61c3e65a76 New Polish translations by toudi5 2013-01-20 11:50:12 -05:00
unknown
fbb516e154 surgecurrent updated ja content_conversantionlist.xml 2013-01-03 2013-01-15 15:39:43 -05:00
Oskar Wiksten
f986391073 Add possibility of having skills that require a quest-level-up before the player can level them up. 2012-11-10 23:08:38 +01:00
Oskar Wiksten
76a3259b84 Bugfix - Disable input before the SurfaceView on MainView is created. 2012-11-10 20:54:17 +01:00
Oskar Wiksten
d375c1b4d8 Added link to Andor's Trail wiki in About/Help. 2012-11-10 16:58:44 +01:00
Oskar Wiksten
c018728197 Add a way to automatically in-game modify how bright maps are displayed, with a colorfilter. Will be used for dungeons that can get automatically darkened, without having to add that to the map files. 2012-11-10 16:33:56 +01:00
Oskar Wiksten
b85943fa80 Bump version number to v0.7.0dev 2012-11-10 13:19:13 +01:00
Oskar Wiksten
f20dc03775 Update .gitignore to exclude IntelliJ workspace files. 2012-11-10 13:17:32 +01:00
1450 changed files with 1002492 additions and 66276 deletions

View File

@@ -4,5 +4,6 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

View File

@@ -1,5 +1,16 @@
gen
bin
assets
# Android ignores
gen/
bin/
target/
local.properties
#IntelliJ
.idea/
out/production/
out/test/
*.iws
*.ipr
# Other
.metadata
.svn
.svn/

View File

@@ -1,4 +0,0 @@
gen
bin
.metadata
.git

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager" forced_jdk="true">
<conelement value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
<conelement value="com.android.ide.eclipse.adt.LIBRARIES" />
<src_description expected_position="1">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
<src_folder value="file://$MODULE_DIR$/gen" expected_position="1" />
</src_description>
</component>
<component name="FacetManager">
<facet type="android" name="Android">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/bin/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/android-support-v4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

View File

@@ -3,13 +3,13 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="33"
android:versionName="0.6.12"
android:versionCode="43"
android:versionName="0.7.2dev"
android:installLocation="auto"
>
<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="10"
android:minSdkVersion="4"
android:targetSdkVersion="21"
/>
<supports-screens
@@ -23,12 +23,16 @@
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><uses-permission android:name="android.permission.READ_LOGS"/>
<application
android:name=".AndorsTrailApplication"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:description="@string/app_description"
android:description="@string/app_description"
android:allowBackup="true"
android:theme="@style/AndorsTrailTheme_Blue"
>
<activity
android:name=".activity.StartScreenActivity"
@@ -42,26 +46,22 @@
<activity
android:name=".activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.NoBackground"
android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
/>
<activity android:name=".activity.HeroinfoActivity" />
<activity android:name=".activity.MonsterInfoActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.ItemInfoActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.LevelUpActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.ConversationActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ShopActivity" />
<activity android:name=".activity.AboutActivity" />
<activity android:name=".activity.LoadingActivity" />
<activity android:name=".activity.Preferences" />
<activity android:name=".activity.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.HeroinfoActivity_Quests" />
<activity android:name=".activity.HeroinfoActivity_Stats" />
<activity android:name=".activity.HeroinfoActivity_Skills" />
<activity android:name=".activity.HeroinfoActivity_Inventory" />
<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.DisplayWorldMapActivity" />
</application>

View File

@@ -0,0 +1 @@
*.mo

View File

@@ -0,0 +1,8 @@
#!/bin/sh
# Creates translation .mo files (binary) from the .po files (text).
# The game reads .mo files, so this needs to be run before building.
for i in *.po ; do
msgfmt "$i" -o $( basename $i .po ).mo
done

31276
AndorsTrail/assets/translation/cs.po Executable file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

31199
AndorsTrail/assets/translation/fi.po Executable file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

31199
AndorsTrail/assets/translation/gl.po Executable file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,10 @@
#!/bin/sh
for i in *.po
do
echo "$i"
msgmerge --no-fuzzy-matching "${i}" english.pot \
| msgattrib --translated \
| msguniq --no-wrap --sort-by-file >"${i}.tmp1"
mv "${i}.tmp1" "$i"
done

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

31199
AndorsTrail/assets/translation/sv.po Executable file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

31694
AndorsTrail/assets/translation/uk.po Executable file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# project structure.
# Project target.
target=android-10

Binary file not shown.

View File

@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="MissingTranslation" severity="ignore" />
<issue id="StringFormatMatches" severity="ignore" />
<issue id="TypographyDashes" severity="ignore" />
<issue id="TypographyEllipsis" severity="ignore" />
<issue id="TypographyOther" severity="ignore" />
<issue id="ContentDescription" severity="ignore" />
<issue id="HardcodedText" severity="ignore" />
<issue id="IconLocation" severity="ignore" />
<issue id="UnusedResources" severity="ignore" />
<issue id="DefaultLocale" severity="ignore" />
<issue id="NewApi" severity="error" />
</lint>

View File

@@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-10
target=android-21

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:fromYDelta="0%"
android:toYDelta="-100%"
android:duration="300"
/>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:fromXDelta="0%"
android:toXDelta="100%"
android:duration="300"
/>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"

View File

@@ -8,7 +8,7 @@
android:fromXScale="1.0"
android:fromYScale="1.0"
android:toXScale="1.1"
android:toYScale="1.1"
android:toYScale="1.1"
android:duration="100"
android:pivotX="50%"
android:pivotY="50%"
@@ -18,7 +18,7 @@
android:fromXScale="1.1"
android:fromYScale="1.1"
android:toXScale="1.0"
android:toYScale="1.0"
android:toYScale="1.0"
android:duration="100"
android:startOffset="100"
android:pivotX="50%"

View File

@@ -5,7 +5,7 @@
android:fromXScale="1.0"
android:fromYScale="1.0"
android:toXScale="0.0"
android:toYScale="0.0"
android:toYScale="0.0"
android:duration="300"
android:pivotX="50%"
android:pivotY="50%"

View File

@@ -5,7 +5,7 @@
android:fromXScale="0.0"
android:fromYScale="0.0"
android:toXScale="1.0"
android:toYScale="1.0"
android:toYScale="1.0"
android:duration="200"
android:pivotX="50%"
android:pivotY="50%"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="300"

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:fromYDelta="-100%"
android:toYDelta="0%"
android:duration="300"
/>

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:fromXDelta="100%"
android:toXDelta="0%"
android:duration="300"
/>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="300"

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_pressed="true" android:color="@color/ui_blue_palette_text_gray_light"/>
<item android:state_enabled="true" android:state_checked="true" android:color="@color/ui_blue_palette_text_gray_light"/>
<item android:state_enabled="true" android:color="@color/ui_blue_palette_text_gray_mid"/>
<item android:state_enabled="false" android:color="@color/ui_blue_palette_text_gray_darker"/>
<item android:color="@color/ui_blue_palette_text_gray_mid"/>
</selector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 515 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item android:drawable="@drawable/loading_anim_00"
android:duration="150" />
<item android:drawable="@drawable/loading_anim_01"
android:duration="80" />
<item android:drawable="@drawable/loading_anim_02"
android:duration="80" />
<item android:drawable="@drawable/loading_anim_03"
android:duration="80" />
<item android:drawable="@drawable/loading_anim_04"
android:duration="80" />
<item android:drawable="@drawable/loading_anim_05"
android:duration="80" />
<item android:drawable="@drawable/loading_anim_06"
android:duration="80" />
<item android:drawable="@drawable/loading_anim_00"
android:duration="150" />
</animation-list>

Binary file not shown.

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Some files were not shown because too many files have changed in this diff Show More