Zukero
|
f9e472291b
|
Merge pull request #26 from HummusSamurai/bugfix-skills-sort
Fixed bug where game crashed if some skills had no requirements when sorted.
|
2017-03-01 17:06:44 +01:00 |
|
HummusSamurai
|
6fec8de9be
|
Fixed bug where game crashed if some skills had no requirements when sorted.
|
2017-03-01 16:47:18 +02:00 |
|
Zukero
|
1ac48619ca
|
Flag changed.
|
2017-02-23 18:10:26 +01:00 |
|
Zukero
|
c667305f25
|
Merge branch 'master' of https://github.com/Zukero/andors-trail
|
2017-02-22 22:42:01 +01:00 |
|
Zukero
|
8c0dd7cb6c
|
More bugfix for actorConditions (used iStacking instead of isStacking in
last fix batch o.O)
|
2017-02-22 15:31:03 +01:00 |
|
Zukero
|
efcf683adf
|
Merge pull request #22 from HummusSamurai/feature/SortingAndCategories
Feature/sorting and categories
Inventory, skills and shoplists can now be filtered and sorted !
Thank you M.H. Alkotob.
|
2017-02-22 14:13:24 +01:00 |
|
M.H. Alkotob
|
4eff7a97c9
|
Changed layout_height(s) to "wrap_content"
|
2017-02-22 14:40:13 +02:00 |
|
Zukero
|
dde191b6da
|
Restored isPositive and isStacking values in actor conditions, destroyed
due to a bug in ATCS.
|
2017-02-21 19:20:23 +01:00 |
|
M.H. Alkotob
|
afaf284a59
|
request changes
|
2017-01-31 10:21:41 +02:00 |
|
Zukero
|
5aeca2a1eb
|
New Script reward type: "changeMapFilter", needs a mapName and effectID.
Works on currentmap too.
|
2017-01-25 18:50:16 +01:00 |
|
Zukero
|
8f7352db33
|
Fixed an issue that prevented quickslots quantities from being updated
when you loot an item that goes there. (Reapplied changes in commit
missed during quickslots_custom_ui merge)
|
2017-01-24 12:59:38 +01:00 |
|
Zukero
|
f10d3f70af
|
Fixed large monsters movement (not used yet, but it bothered me). They
couldn't move because there always was a monster in the way: themselves.
And redrawing area wasn't computed correctly.
|
2017-01-23 17:55:00 +01:00 |
|
Zukero
|
e8ace3666d
|
EOL restoration
|
2017-01-23 16:44:26 +01: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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|