OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-22 03:19:12 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
897 Commits 44 Branches 0 Tags
ac850f953e64aafbe70c496fdff74b00bc83b2c2
Commit Graph

897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
ac850f953e Merge branch 'master' into stoutford_tests 2017-01-23 17:55:33 +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
79ab254f9b Merge branch 'master' into stoutford_tests 2017-01-23 17:04:38 +01:00
Zukero
e8ace3666d EOL restoration 2017-01-23 16:44:26 +01:00
Zukero
17e10ae369 Added items_rijackson_1 to the loaded tilesets. 2017-01-22 22:42:54 +01:00
Zukero
0f187e08d9 Merge pull request #24 from Rijackson/stoutford_tests 
Changes to dialogues and questlogs in new material in stoutford_tests
 2017-01-22 22:36:16 +01:00
Rijackson
6eeff75134 Clean up the strange unicode stuff. 2017-01-22 12:02:02 -05:00
Rijackson
653648e65c Clean up a few mistakes and the strange negated requirments 2017-01-22 11:24:52 -05:00
Rijackson
725d0ed632 More sprites added in items_rijackson_1.png. Clean up punctuation, typos etc. in dialogues, Change dialogue so that it is Andor's companion, not Andor himself, that persuades Glasforn to imprison the hero with the lich. 2017-01-21 17:24:11 -05: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
fd21fd62ec Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
 2017-01-20 16:56:27 +01:00
Zukero
6d77d8806b 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:07:05 +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
Zukero
f2461eed70 Merge branch 'master' into stoutford_tests 2017-01-04 16:35:35 +01: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
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
1a0df571b1 Reordered JSON files with ATCS. Should create a good basis for cleaner 
diffs.
 2016-12-21 16:51:00 +01:00
Zukero
4d0b23062e Fixed tloading of the new tilesets. 2016-08-12 15:49:49 +02:00
Zukero
7c97448d12 New spritesheets by JapoZero and Enterbrain 
(http://xxjapozeroxx.deviantart.com). Was originally 24x24, upscaled to
32x32, doesn't look too blurred to me. 
New content for Stoutford, especially Kayla's shop and dialogues.
 2016-08-12 15:30:41 +02:00
Zukero
af85f0edf6 New colorfilter values : redtint, greentint, and bluetint. 2016-08-10 18:00:15 +02:00
Zukero
cff0ef7df5 New colorfilter values : redtint, greentint, and bluetint. 2016-08-10 17:57:51 +02:00
Zukero
404385151b Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/xml/home.tmx
	AndorsTrail/res/xml/stoutford_cellar.tmx
	AndorsTrail/res/xml/stoutford_cellar2.tmx
	AndorsTrail/res/xml/stoutford_church.tmx
	AndorsTrail/res/xml/stoutford_cottage2.tmx
	AndorsTrail/res/xml/stoutford_farmhouse1.tmx
	AndorsTrail/res/xml/stoutford_ne.tmx
	AndorsTrail/res/xml/stoutford_tavern.tmx
 2016-08-08 16:45:34 +02:00
Zukero
e631e849e3 Patched all maps to include latest set of tilesets. 2016-08-08 16:34:30 +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
425e697d9f Small bugfixes for stoutford. 2016-07-22 13:57:08 +02:00
Zukero
4433e0de07 Removed ugly log. 2016-07-21 16:35:32 +02:00
Zukero
c277ff4266 Stoutford's main quest done, but needs testing. 
Some crash points exists (don't trade with the thief)
 2016-07-21 16:23:32 +02:00
Zukero
63449f7e3c Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/xml/stoutford_church.tmx
 2016-07-19 17:45:06 +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
fa80291ddd Merge branch 'master' into stoutford_tests 2016-04-26 13:32:12 +02:00
Zukero
b32ee1dad8 Revert "Fixed Health and XP bars bug for Marshmallow devices. Tested down to Donut on x86 VM." 
This reverts commit 269c6567ae.
 2016-04-26 13:31:37 +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
269c6567ae Fixed Health and XP bars bug for Marshmallow devices. Tested down to 
Donut on x86 VM.
 2016-04-26 13:25:57 +02:00
Zukero
6ca4786e6a First content for Stoutford. Minimalistic, should-not-crash-the-game 
kind of content.
 2016-01-07 18:24:58 +01: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