Commit Graph

2901 Commits

Author SHA1 Message Date
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
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
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
Zukero
fc569d841f Fixed issue in the debug droplist's chance format (number instead of
string)
2019-04-24 00:48:02 +02:00
Nut
7127cf8647 Update items_misc_3.png 2019-04-21 09:28:49 +02:00
Nut
4049f0d5dd target version for compile 2019-04-21 01:04:22 +02:00
Nut
42d0bef263 target version for compile+test 2019-04-21 00:25:54 +02:00
Zukero
2623fe6517 Merge pull request #116 from Chriz76/replaceareamapcheck
Fixed replace area validation
2019-04-10 15:21:50 +02:00
Zukero
6deca064d4 Clean up debugging items. 2019-04-10 15:20:56 +02:00
Zukero
f856b03c37 Removed bogus tileset references in a pair of maps. 2019-04-10 15:17:59 +02:00
Gonk
43831ae7e0 Fixed replace area validation 2019-03-28 21:49:24 +01:00
Zukero
a4b2dc8b4e Merge pull request #112 from BWPanda/patch-1
Removed 'guynmart_main_3' duplicate
2019-03-16 08:26:09 +01:00
Zukero
cdbfd5f9b2 Merge pull request #113 from BWPanda/patch-2
Fixed grammar.
2019-03-16 08:24:45 +01:00
Peter Anderson
03958eb3f1 Fixed grammar. 2019-03-15 23:15:01 +02:00
Peter Anderson
65d2a73efa Removed 'guynmart_main_3' duplicate 2019-03-15 22:15:05 +02:00
Zukero
0492bfbde0 Merge pull request #111 from Rijackson/master
Add scythe to axe proficiency skill and whip to blunt proficiency ski…
2019-03-09 19:37:14 +01:00
Rijackson
efe06255a3 Add scythe to axe proficiency skill and whip to blunt proficiency skill. Changes to Falothen's dialogue to reflect this are here: https://github.com/Rijackson/0_7_6_ATCS 2019-03-09 11:30:07 -05:00
Zukero
1dbf4bf5cb Fixes for the most "popular" and puzzling crashes on GPlay,
supposedly caused by extreme race conditions.
2019-02-22 21:02:35 +01:00
Zukero
72a36a7c12 Fix crash when taunting with instant combat speed.
Thanks Little_John for your help tracking it down!
2019-02-22 19:37:30 +01:00
Zukero
cac9237d9e Merge pull request #107 from Rijackson/master
Added Rafael Mendes (fifa1988) to authors.xml for PT/BR translation. …
2019-02-12 08:01:55 +01:00