Commit Graph

1663 Commits

Author SHA1 Message Date
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
cc6d578c0e Merge branch 'master' into stoutford_tests 2018-02-27 18:38:27 +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
suki liao
3e58e1d451 Translated using Weblate (Chinese (Simplified))
Currently translated at 3.1% (202 of 6378 strings)
2018-02-25 09:35:40 +01:00
David Arranz
6f95aae5b0 Translated using Weblate (Spanish)
Currently translated at 24.4% (1557 of 6378 strings)
2018-02-24 00:41:54 +01:00
Zukero
d30cf7fb91 Merge branch 'master' into stoutford_tests 2018-02-23 00:05:04 +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
091ed4e773 Merge pull request #46 from Rijackson/stoutford_tests
New map_fence_4.png
2018-02-22 13:51:28 +01:00
Rijackson
30f8755ef5 New map_fence_4.png 2018-02-21 19:20:06 -05:00
Rafael Henrique Mendes de Oliv
91e237137f Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (6378 of 6378 strings)
2018-02-14 00:38:55 +01:00
Максим Якимчук
ee714c4d75 Translated using Weblate (Ukrainian)
Currently translated at 10.8% (690 of 6378 strings)
2018-02-13 20:39:42 +01:00
Rafael Henrique Mendes de Oliv
2ec4b49d3a Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (6378 of 6378 strings)
2018-02-12 23:19:58 +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
Rafael Henrique Mendes de Oliv
407adbc782 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (458 of 458 strings)
2018-02-11 11:04:52 +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
d8fd9e3799 Merge branch 'master' into stoutford_tests
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
2018-02-10 14:37:04 +01: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
NutAndor
0583622427 Merge pull request #1 from Zukero/stoutford_tests
Stoutford tests
2018-02-10 09:13:12 +01:00
Rafael Henrique Mendes de Oliv
55d45e7dc1 Translated using Weblate (Portuguese (Brazil))
Currently translated at 83.4% (5322 of 6378 strings)
2018-02-08 13:39:02 +01:00
Rafael Henrique Mendes de Oliv
e75a4c59cb Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.7% (457 of 458 strings)
2018-02-07 17:38:38 +01:00
Viktar Vauchkevich
066658625b Translated using Weblate (Belarusian)
Currently translated at 100.0% (458 of 458 strings)
2018-02-03 22:08:45 +01:00
Марс Ямбар
ae8630e6e3 Translated using Weblate (Ukrainian)
Currently translated at 10.5% (675 of 6378 strings)
2018-01-31 23:41:20 +01:00
Viktar Vauchkevich
ede0aaf615 Added translation using Weblate (Belarusian) 2018-01-30 22:10:54 +01:00
Марс Ямбар
22a05e6ea9 Translated using Weblate (Ukrainian)
Currently translated at 18.7% (86 of 458 strings)
2018-01-29 19:42:56 +01:00
Mutaz Tayyeb AbuSaad
2379d54e10 Translated using Weblate (Arabic)
Currently translated at 0.1% (6 of 6388 strings)
2018-01-28 09:34:18 +01:00
Mutaz Tayyeb AbuSaad
4aac49aac9 Translated using Weblate (Arabic)
Currently translated at 0.1% (3 of 6388 strings)
2018-01-27 09:24:52 +01:00
Марс Ямбар
5235961871 Translated using Weblate (Ukrainian)
Currently translated at 10.5% (674 of 6378 strings)
2018-01-24 13:34:21 +01:00
Марс Ямбар
9feb321a1f Translated using Weblate (Ukrainian)
Currently translated at 18.5% (85 of 458 strings)
2018-01-24 13:34:20 +01:00
Sıtkı Bağdat
d329d24094 Translated using Weblate (Turkish)
Currently translated at 18.3% (1173 of 6378 strings)
2018-01-24 13:32:21 +01:00
Daniel-Ømicrón Rodríguez Garcí
c091ef3cdc Translated using Weblate (Spanish)
Currently translated at 92.5% (424 of 458 strings)
2018-01-24 13:29:18 +01:00
Allan Nordhøy
39a7dfdd24 Translated using Weblate (Norwegian Bokmål)
Currently translated at 82.3% (377 of 458 strings)
2018-01-24 13:21:40 +01:00
rixty
277821fc91 Translated using Weblate (Italian)
Currently translated at 45.0% (2874 of 6378 strings)
2018-01-24 13:18:27 +01:00
ghsuvr
d188b08c32 Translated using Weblate (Hebrew)
Currently translated at 27.0% (124 of 458 strings)
2018-01-24 13:16:14 +01:00
Olivier Dragon
311fc5e07a Translated using Weblate (French)
Currently translated at 76.7% (4897 of 6378 strings)
2018-01-24 13:12:32 +01:00
Erin Heart
61cf342db2 Translated using Weblate (English (United States))
Currently translated at 0.1% (3 of 6388 strings)
2018-01-24 13:09:30 +01:00
Erin Heart
403eaa8a9a Translated using Weblate (English)
Currently translated at 100.0% (458 of 458 strings)
2018-01-24 13:08:34 +01:00
Yura
63dacda4c6 Translated using Weblate (Ukrainian)
Currently translated at 10.5% (672 of 6378 strings)
2018-01-22 22:56:50 +01:00
Yura
96a9c17a2a Translated using Weblate (Ukrainian)
Currently translated at 16.5% (76 of 458 strings)
2018-01-22 20:59:27 +01:00