Commit Graph

2918 Commits

Author SHA1 Message Date
Gonk
2d2bc41708 Merge branch 'arulir_mountain' of https://github.com/NutAndor/andors-trail into nut_arulir_mountain 2019-11-30 00:25:37 +01:00
Gonk
b91e924a75 Added my self to the authors 2019-11-30 00:25:02 +01:00
Chriz76
16eece8ee4 Merge pull request #28 from Chriz76/actionpointsfix
action points are reset after a fight so the action points displayed …
2019-11-24 20:17:13 +01:00
Nut
de1e5fe34e base for v078dev
with added new Arulir graphics
2019-11-24 05:05:12 +01:00
Gonk
b3cecaf845 action points are reset after a fight so the action points displayed are always max when not in a fight 2019-11-20 23:04:48 +01:00
Gonk
bf9e2ce947 Merge branch 'rangefix' into nut_arulir_mountain 2019-11-14 22:34:37 +01:00
Gonk
9c4374502e some fixes regarding ranges
corrected display of negative values
min value has to be smaller than max value
added a debug check
2019-11-14 22:33:07 +01:00
Gonk
764f39967d Merge branch 'localefix' into nut_arulir_mountain 2019-11-10 09:07:49 +01:00
Gonk
228cc308d7 Removed check if AT is initialized when changing the locale to fix problems on some activities where still the localized content was shown 2019-11-10 09:06:00 +01:00
Gonk
382a26a18d Merge branch 'permadeath' into nut_arulir_mountain 2019-11-01 18:47:43 +01:00
Gonk
6511333545 fixed closure compiler error 2019-11-01 18:47:13 +01:00
Gonk
008a37a6ac Merge branch 'permadeath' into nut_arulir_mountain 2019-11-01 13:05:33 +01:00
Gonk
50373951b5 mode selection values for new heroes are now translateble 2019-11-01 13:03:40 +01:00
Gonk
5131183af4 Merge branch 'languageselection' into nut_arulir_mountain 2019-10-30 23:00:40 +01:00
Gonk
2697d3aad3 Merge branch 'localefix' into nut_arulir_mountain 2019-10-30 22:56:13 +01:00
Gonk
ea257dffee Merge branch 'developmentsavegames' into nut_arulir_mountain 2019-10-30 22:55:17 +01:00
Gonk
65461fcf65 Merge branch 'poleweapon' into nut_arulir_mountain 2019-10-30 22:50:32 +01:00
Gonk
045b4708fa Merge branch 'factionscoreequals' into nut_arulir_mountain 2019-10-30 22:48:17 +01:00
Gonk
17e6cf3bec Merge branch 'permadeath' into nut_arulir_mountain 2019-10-30 22:47:13 +01:00
Gonk
f7ebf1be0e hidden backup for limited saves games at a maximum of 2 minutes 2019-10-30 22:18:03 +01:00
Gonk
5e4278bec6 hidden backup for limited saves games at a maximum of 2 minutes 2019-10-30 22:16:32 +01:00
Nut
83c1f5e860 Merge pull request #24 from NutAndor/v0761a
Sync with V077
2019-10-29 23:44:25 +01:00
Nut
35e1e5a501 Merge branch 'arulir_mountain' into v0761a 2019-10-29 23:40:10 +01:00
Gonk
da7dbdcf69 ui language can now be chosen in the preferences 2019-10-28 23:59:29 +01:00
Nut
4b0851b417 translator added to authors list 2019-10-27 02:00:46 +02:00
Nut
d6ef0c9867 release build v0.7.7 before compression 2019-10-24 20:56:27 +02:00
Nut
93ba6ee4ac release build v0.7.6.1 before compression 2019-10-20 23:18:02 +02:00
Nut
126fb0d951 author 2019-10-20 23:06:32 +02:00
Nut
3245f18b55 preparation for release build v0.7.6.1 2019-10-20 22:37:09 +02:00
Gonk
755854c93a factionScoreEquals Requirement
- Also added the "old" factionScore to the isValid methode. This should make it possible to use the factionScore in replaceAre requirements
2019-10-13 18:06:39 +02:00
Nut
2b72395196 Merge pull request #23 from Zukero/master
PR to get actual
2019-10-03 22:16:20 +02:00
Zukero
495b48cbf8 Merge pull request #138 from NutAndor/v076
Release candidate v076 before compression
2019-10-03 22:09:43 +02:00
Nut
837e54c33e preparation for release build 2019-10-03 21:43:25 +02:00
Gonk
5812f49fc3 added null check 2019-09-10 22:33:37 +02:00
Gonk
22bd3da2a9 development savegames are marked and overwriting regular savegames is not allowed in development mode 2019-09-10 21:38:03 +02:00
Gonk
0975ac7b26 permadeath and limited saves
- When starting a new game the player can choose the regular default mode (unlimited saves and lives) or one of the new modes (Unlimited lives, 50, 10 ,3, 1 life)
- The mode and remaining lives is displayed on the hero overview page.
- There can be only one savegame for a limited saves game: Saving a limited save game ends the game. Loading a limited saves game deletes the save slot.
- Heros now have a hero ID and there is a cheat prevention that checks if the savegame was already continued.
- Added some warning and explanation dialogues
2019-07-28 22:32:20 +02:00
Gonk
d04176e055 adjusted sorting of skills
- until now the ordinal value of the skill id was used as default sort order. Since the ordinals are stored in the savegames  inserting new skills was only possible at the end of the list.
- skills now have a position member that determines the default sort order
- now using a linkedhashmap for storing the skills. this map allows iterating in the order in which the values were inserted
- switching back to "unsorted" restores the default sort order
- changed the order for the pole weapon proficency to be behind the other weapon proficiencies
2019-07-11 21:28:31 +02:00
Gonk
6a7a9a8750 added pole weapons category and proficiency, removed scythe category 2019-07-07 22:55:32 +02:00
Gonk
f4aa70a3e7 Improved localization handling on screen turn (might fix issue #125)
- in some activities the code for setting the locale was missing and therefore a simple turn of the device switched to localized texts even if localized resources were disabled
- for all other activities there was the problem that the locale was set only in onCreate but in some special cases the config is reset but only onResume gets called (e.g. when turning the device, hitting the home button, turning the device back and then switching to AT again). Setting it only in onResume would be too late for the regular cases. The code is almost a noop if there is no change to be done so it seems ok to call it twice.
- created two baseclasses for activities to encapsulate the logic and increase the chance that a new activity will be based on that classes and the code will not be forgotten
- might fix issue #125 "Localized resources showing even when disabled"
- ways of working solutions for setting the locale differ from API level to API level (see https://proandroiddev.com/change-language-programmatically-at-runtime-on-android-5e6bc15c758)
- tested on android Pie and Marshmallow
2019-06-24 23:01:49 +02:00
Nut
18099e016b merge of 0_7_6_ATCS and omicronrg9 2019-06-20 19:12:47 +02:00
Nut
ebd5b538ca basic settings 2019-06-20 17:35:25 +02:00
Nut
74c901953f basic setting 2019-06-20 10:26:22 +02:00
Nut
538750bb0c Merge pull request #21 from Zukero/master
merge zukero
2019-06-20 10:10:50 +02:00
Zukero
c4119fa48e Merge pull request #124 from Chriz76/teleportbrimhaven
debuginterface teleport to brimhaven4 south
2019-06-09 08:50:27 +02:00
Gonk
db36afa5e5 debuginterface teleport to brimhaven4 south 2019-06-08 23:10:36 +02:00
Nut
3d65e72f59 Merge pull request #18 from NutAndor/master
sync with zukero
2019-06-05 20:46:11 +02:00
Nut
131ac0ec79 Merge pull request #17 from Zukero/master
sync with zukero
2019-06-05 20:39:20 +02:00
Zukero
97a81e3d8e Merge pull request #120 from Chriz76/randomrequirements
Randomrequirements
2019-05-12 12:04:44 +02:00
Gonk
176cf1dd76 Use chance member in Requirement for random requirements
- it is based on the text in requireID
- adjusted parsing
2019-05-11 21:27:11 +02:00
Gonk
9a0f183392 Added random requirement using the same format like the droplist chance encoded in the requireID. 2019-04-24 23:03:36 +02:00