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
2,953 Commits 44 Branches 0 Tags
f097e0a80ff3c2f00a5ae6df79fcc59a2b1f6812
Commit Graph

338 Commits

Author SHA1 Message Date
Nut
07af87e484 lookout bed 
+ change translators order in authors
 2019-01-13 01:17:46 +01:00
Nut
2919b3ca4b Update authors.xml 
2 new German translations credit
 2019-01-11 20:45:44 +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
53c9a6f9ed Fixed issue where red X on worldmap would disappear on segments with 
negative offset.
 2019-01-05 22:09:10 +01:00
Zukero
13ac7a86bd Merge pull request #89 from urbalazs/ui-string-suggestion 
Improved wording
 2019-01-05 18:55:17 +01:00
Zukero
cf3a40072f Fixed rare NPE on loading game. Fixed encoding on worldmap. 2019-01-03 13:05:54 +01:00
Zukero
358f84b1ee Added permission request code. 2018-12-08 09:39:03 +01:00
Balázs Úr
ccd1f31127 Improved wording 2018-11-11 13:02:41 +01:00
Balázs Úr
54286bb0d2 Improved wording 2018-10-29 00:11:53 +01:00
Balázs Úr
03b2de6c61 Added myself to contributor list 2018-10-28 10:00:35 +01:00
Zukero
3ad385e02f Attempt to fix perf issue with filters 
that plagues some devices only.
 2018-09-28 13:33:30 +02:00
Zukero
0f9b7c11aa Merge remote-tracking branch 'weblate-content/master' 
Conflicts:
	AndorsTrail/res/values/strings.xml
 2018-08-10 22:48:52 +02:00
Zukero
a516f83aff Merge pull request #57 from Rijackson/master 
Removed map fields11a.tmx, which was causing conflicts with existing …
 2018-08-05 01:00:06 +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
Nut
1e3f3310c2 new graphic monsters_maksiu1, and an author list entry 2018-07-20 16:52:16 +02: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
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
28ddc13217 adds to guynmart_merge 
I forgot loadresources.xml :(
and added me to authors.xml
 2018-06-04 01:22:59 +02:00
Nut
9992948740 Guynmart merge 
next try
 2018-06-03 15:39:33 +02:00
Rijackson
c1a8619f40 Added URL for Mike Gulisano 2018-05-26 18:14:32 -04: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
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
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
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
Erin Heart
403eaa8a9a Translated using Weblate (English) 
Currently translated at 100.0% (458 of 458 strings)
 2018-01-24 13:08:34 +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
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
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
aea3571ca5 Fixed title screen animation for Lollipop+ 
Larger buttons overall and better spacing between replies.
 2017-11-14 19:03:58 +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