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 |
|
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 |
|