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
944 Commits 44 Branches 0 Tags
da0663bea61cd106baaa3b3bec7307af6bd2f212
Commit Graph

944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
da0663bea6 Preparatory commit for the stoutford_roots_love ATCS project 2017-03-31 09:26:07 +02:00
Zukero
74ac7127b4 Merge branch 'master' into stoutford_tests 2017-02-23 18:10:42 +01: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
088b2061f3 Merge branch 'master' into stoutford_tests 2017-02-22 15:32:10 +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
751972451f Merge branch 'master' into stoutford_tests 2017-01-24 13:14:30 +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
ac850f953e Merge branch 'master' into stoutford_tests 2017-01-23 17:55:33 +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
79ab254f9b Merge branch 'master' into stoutford_tests 2017-01-23 17:04:38 +01:00
Zukero
e8ace3666d EOL restoration 2017-01-23 16:44:26 +01:00
Zukero
17e10ae369 Added items_rijackson_1 to the loaded tilesets. 2017-01-22 22:42:54 +01:00
Zukero
0f187e08d9 Merge pull request #24 from Rijackson/stoutford_tests 
Changes to dialogues and questlogs in new material in stoutford_tests
 2017-01-22 22:36:16 +01:00
Rijackson
6eeff75134 Clean up the strange unicode stuff. 2017-01-22 12:02:02 -05:00
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
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