OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-21 19:08:30 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
6,627 Commits 44 Branches 0 Tags
b4c490f648dcca2f2f4ec29bd97dd945ede1461e
Commit Graph

6627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nut Andor
d0baee2b90 Translated using Weblate (German) 
Currently translated at 99.9% (6377 of 6378 strings)
 2017-01-16 12:45:19 +01:00
Olivier Dragon
16265689d5 Translated using Weblate (French) 
Currently translated at 72.5% (4625 of 6378 strings)
 2017-01-15 03:44:53 +01:00
Mohamad Alkotob
7c61ad5f81 extra newlines 2017-01-13 16:52:17 +02:00
Mohamad Alkotob
7afe881ead extra newlines 2017-01-13 16:51:39 +02:00
HummusSamurai
0a8259d5a8 Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories 2017-01-13 16:50:14 +02:00
HummusSamurai
a60e2ab4c5 The sorting/category buttons in the inventory are now above the inventory list directly. 2017-01-13 16:49:43 +02:00
Christa Sorenson
d2204367a2 Translated using Weblate (Swedish) 
Currently translated at 6.3% (405 of 6378 strings)
 2017-01-12 15:46:35 +01:00
Christa Sorenson
c485690c45 Translated using Weblate (Swedish) 
Currently translated at 13.7% (63 of 458 strings)
 2017-01-09 18:46:33 +01:00
Christa Sorenson
950cbe6794 Added translation using Weblate (Swedish) 2017-01-07 17:44:12 +01:00
Mohamad Alkotob
ffd37a709b Added name under "Additional programming" 
Initials before surname due to ethnic saltiness
 2017-01-06 16:04:44 +02:00
Mohamad Alkotob
410f796c31 Update HeroinfoActivity_Inventory.java 2017-01-05 09:26:37 +02:00
Mohamad Alkotob
4b58722b05 end already 2017-01-05 09:23:57 +02:00
Mohamad Alkotob
2b6ce058b6 guess what more tabs 2017-01-05 09:23:09 +02:00
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
Vinicius Veroneze
d0c7dc7843 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.2% (450 of 458 strings)
 2017-01-04 21:45:52 +01: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
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
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
Mohamad Alkotob
2f0c9a7e97 Translated using Weblate (Arabic) 
Currently translated at 2.1% (10 of 458 strings)
 2017-01-01 21:44:07 +01:00