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
6,398 Commits 44 Branches 0 Tags
03b0ec16deaee23faec2bdf58f291328fa8d655f
Commit Graph

6398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Olivier Dragon
ebbf3b4a5a Translated using Weblate (French) 
Currently translated at 72.4% (4624 of 6378 strings)
 2017-01-01 18:44:53 +01:00
Mohamad Alkotob
33feeee396 Added translation using Weblate (Arabic) 2016-12-30 18:27:55 +01:00
Weblate
35b39ff15c Merge remote-tracking branch 'origin/master' 2016-12-29 00:41:08 +01:00
Stefanie Beck
f9c009116d Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2016-12-29 00:40:11 +01:00
Kevin Pochat
43be5f994c Translated using Weblate (French) 
Currently translated at 72.2% (4611 of 6378 strings)
 2016-12-29 00:40:10 +01:00
Voom
347eb64b40 Translated using Weblate (Bulgarian) 
Currently translated at 1.3% (86 of 6388 strings)
 2016-12-29 00:40:10 +01:00
Nut Andor
ed286d8f5b Translated using Weblate (German) 
Currently translated at 100.0% (458 of 458 strings)
 2016-12-29 00:40:09 +01:00
Olivier Dragon
9d1bff8c80 Translated using Weblate (French) 
Currently translated at 72.2% (4611 of 6378 strings)
 2016-12-29 00:38:27 +01:00
Nut Andor
99a820325e Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2016-12-28 22:35:01 +01:00
Voom
3a811023fe Added translation using Weblate (Bulgarian) 2016-12-28 19:29:18 +01:00
Hristo Alexandrov
c2dfbb3f0a Added translation using Weblate (Bulgarian) 2016-12-27 21:40:29 +01:00
Olivier Dragon
d6aaad9447 Translated using Weblate (French) 
Currently translated at 71.4% (4556 of 6378 strings)
 2016-12-23 06:44:49 +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
Olivier Dragon
ab7195fca5 Translated using Weblate (French) 
Currently translated at 70.9% (4528 of 6378 strings)
 2016-12-20 15:44:48 +01:00
Vladimir
654f6d603a Translated using Weblate (Russian) 
Currently translated at 100.0% (6378 of 6378 strings)
 2016-12-13 21:45:51 +01:00
ivo
0645a28e21 Translated using Weblate (Ukrainian) 
Currently translated at 9.8% (629 of 6378 strings)
 2016-12-11 21:46:38 +01:00
Olivier Dragon
b12713ab34 Translated using Weblate (French) 
Currently translated at 70.6% (4508 of 6378 strings)
 2016-12-08 18:44:47 +01:00
Stefanie Beck
7a008ef1c5 Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2016-12-08 12:44:58 +01:00
Olivier Dragon
5a5e35f54f Translated using Weblate (French) 
Currently translated at 70.6% (4504 of 6378 strings)
 2016-12-05 09:44:45 +01:00
Olivier Dragon
88fa699c77 Translated using Weblate (French) 
Currently translated at 70.5% (4498 of 6378 strings)
 2016-11-30 06:44:47 +01:00
Olivier Dragon
06b519e0b5 Translated using Weblate (French) 
Currently translated at 69.8% (4454 of 6378 strings)
 2016-11-25 03:44:44 +01:00
Olivier Dragon
ce67397087 Translated using Weblate (French) 
Currently translated at 69.3% (4422 of 6378 strings)
 2016-11-20 21:44:46 +01:00
Olivier Dragon
cd48fb3ab2 Translated using Weblate (French) 
Currently translated at 68.9% (4396 of 6378 strings)
 2016-11-14 00:44:45 +01:00
Michel Pocrave
60eb7203fe Translated using Weblate (French) 
Currently translated at 67.3% (4298 of 6378 strings)
 2016-11-01 16:38:49 +01:00
Olivier Dragon
4ba42ec044 Translated using Weblate (French) 
Currently translated at 67.3% (4297 of 6378 strings)
 2016-11-01 16:36:36 +01:00
Вадим Власюк
786743f918 Translated using Weblate (Russian) 
Currently translated at 18.9% (87 of 458 strings)
 2016-11-01 00:45:56 +01:00
Ostap Bender
ae419d6f87 Translated using Weblate (French) 
Currently translated at 67.1% (4286 of 6378 strings)
 2016-10-31 12:01:46 +01:00
Olivier Dragon
4d75c71870 Translated using Weblate (French) 
Currently translated at 67.1% (4285 of 6378 strings)
 2016-10-31 04:52:51 +01:00