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
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
