OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
4,788 Commits 44 Branches 0 Tags
cb07e4e0efa90899fd2cbcbd05d2ca69779bf79d
Commit Graph

228 Commits

Author SHA1 Message Date
Nut.andor
2b533f9617 fungi_panic 2021-01-24 22:44:06 +01:00
Nathan Watson
099acfcdb6 Configurable dpad transparency 2021-01-16 17:34:33 -08:00
Nut
486feeb4f8 building 0.7.12 2020-09-20 23:10:03 +02:00
Nut
5bc08762a9 Sync with v0.7.11 2020-06-11 04:24:05 +02:00
Nut
59a2c0ea45 building 0.7.11 2020-06-06 00:31:23 +02:00
Rijackson
54256f81d7 Delete three unused BWM maps 2020-05-10 17:31:28 -04:00
Nut
9de274dc95 Revert "Merge pull request #36 from jasp00/secret_garden" 
not because it may be wrong, but content should be better created with an atcs project

This reverts commit bf5bc2b92d, reversing
changes made to efca0a905a.
 2020-05-10 17:04:39 +02:00
Chriz76
bf5bc2b92d Merge pull request #36 from jasp00/secret_garden 
Fix A secret garden: clearing out monsters
 2020-05-09 21:10:15 +02:00
Javier Serrano Polo
7c173eda1e Fix A secret garden: clearing out monsters 2020-04-28 21:51:10 +02:00
tomjobes
4560e16973 Fix tree problem in road1 near roadblock 2020-04-22 14:33:22 -04:00
Gonk
153ceafa9a Fixed a small map flashing in the map triggered by a transparent ground tile 2020-03-30 21:08:59 +02:00
Nut
eafcfc2fd8 Burchzyd 2020-02-25 22:44:22 +01:00
Nut
2a10a2dfd0 Building v079 from ATCS v079 2020-02-23 16:30:49 +01:00
Nut
d2ccb9b118 v078 (yet without translations) 2020-01-09 23:23:21 +01:00
Nut
46af6d3c4c Revert "v078" 
This reverts commit 4cff325789.
 2020-01-09 22:08:02 +01:00
Nut
4cff325789 v078 2020-01-09 00:25:33 +01:00
Gonk
da7dbdcf69 ui language can now be chosen in the preferences 2019-10-28 23:59:29 +01:00
Nut
837e54c33e preparation for release build 2019-10-03 21:43:25 +02:00
Nut
18099e016b merge of 0_7_6_ATCS and omicronrg9 2019-06-20 19:12:47 +02:00
Zukero
f856b03c37 Removed bogus tileset references in a pair of maps. 2019-04-10 15:17:59 +02:00
Nut
07af87e484 lookout bed 
+ change translators order in authors
 2019-01-13 01:17:46 +01:00
Nut
275159a785 Revert "lookout bed" 
This reverts commit 735dfa0ba4.
 2019-01-13 00:58:07 +01:00
Nut
735dfa0ba4 lookout bed 2019-01-13 00:57:30 +01:00
Zukero
1df0534dc8 Merged ATCS project bugfix_0_7_4 (from rijackson's github repo) 2019-01-08 15:25:47 +01:00
Zukero
bfe243f670 Cleanup of data. 
Removed unused, obsolete entries.
 2018-11-24 18:47:25 +01:00
Zukero
3ef4e501f9 Fixed minor issue with secret room pop-up in waterwayacavex 2018-10-31 12:50:40 +01:00
Zukero
1e11a008ee Merge pull request #67 from NutAndor/master 
fixes in lakecave, stoutford, guynmart
 2018-09-29 10:02:50 +02:00
Zukero
3ad385e02f Attempt to fix perf issue with filters 
that plagues some devices only.
 2018-09-28 13:33:30 +02:00
Nut
2f612e8897 Erwyns death redesigned 2018-09-27 00:54:07 +02:00
NutAndor
87f00e1531 Merge pull request #4 from Zukero/master 
merge from zukero
 2018-09-23 17:09:37 +02:00
Rijackson
5d38ccbb68 Fix for the "graveyard loophole" and adjustment of Guynmart shield stats. 2018-09-16 19:47:49 -04:00
Nut
717f5c39e5 fixes in lakecave, stoutford, guynmart 
Caedas dialogue, trolls in lakecave
Gyras hint to find the helmet,
Map issues in guynmart
 2018-09-17 00:13:07 +02:00
Rijackson
166698a592 Fixed the missing treetops in waterwaya3, a typo, and some capitalization issues. 2018-09-08 16:01:23 -04:00
Nut
a05621feeb some map fixes 
In waytogalmore0.tmx I found an issue with Lutarcs poser 'Mikhail': he doesn't spawn as he should, so there is no icon in dialogue.
And I found a more cumbersome issue in the following 12 tmx maps:
There was taken 1 or more duplicate png file, with the path  ../../altered/drawable/...  instead of  ../drawable/...   and some sprites were taken from there also.
 2018-08-27 22:35:36 +02:00
Zukero
df89a1001a Updated guynmart_wood_9 to use dynamic tiles placeholder for the hero 
statue.
 2018-08-24 16:11:15 +02:00
Zukero
ba094b4b95 First implementation of dynamic placeholder tiles for maps. 2018-08-24 09:56:18 +02:00
Rijackson
8f3151368a Removed fields11a from worldmap.xml, because the map was removed in an earlier bug fix. 2018-08-19 18:45:24 -04:00
Rijackson
8254db89a5 Fixed waytolake7b 2018-08-17 08:05:04 -04:00
Zukero
27dee8b368 Merged ATCS project "bugfix_v0.7.2" 2018-08-15 14:25:23 +02:00
Rijackson
7b6ff3e22f Removed map fields11a.tmx, which was causing conflicts with existing map fields11.tmx. fields11.tmx has been replaced with fields11a.tmx in bugfix project. 2018-08-04 18:09:50 -04:00
Zukero
4ab509aead ATCS Project stoutford_combined finally integrated! 2018-07-08 15:54:47 +02:00
Zukero
ce0e1871ab Merge branch 'master' into stoutford_tests 
# Conflicts:
#	AndorsTrail/res/raw/conversationlist_fallhaven_south.json
#	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
#	AndorsTrail/res/raw/questlist_pathway_fallhaven.json
 2018-07-08 15:41:51 +02:00
Rijackson
8e972d579d Final tweaks 2018-06-23 15:01:58 -04:00
Rijackson
60e9fa7073 Initial Teksin commit 2018-06-13 18:20:49 -04:00
NutAndor
e00ec840a1 Merge pull request #5 from Zukero/master 
merge zukeros master into nuts stoutford_tests
 2018-06-07 23:04:45 +02:00
Nut
9992948740 Guynmart merge 
next try
 2018-06-03 15:39:33 +02:00
Zukero
520074bd12 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/drawable/map_fence_4.png
	AndorsTrail/res/values/loadresources.xml
 2018-05-15 10:55:11 +02:00
Rijackson
e29bc07150 The graveyard and waterwaycave material from Gulisano and me. 2018-04-23 18:18:57 -04:00
Rijackson
4d771057e6 Fix bwentry worldmap and English on one sign 2018-03-30 16:36:11 -04:00
Zukero
bf9081df00 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
 2018-03-27 13:24:08 +02:00