1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

16618 Commits

Author SHA1 Message Date
Laserlicht
e629b7a371 reduce to 12 with gap 2024-07-17 19:26:18 +02:00
Aleksandar Kazandzhiev
551b87e2cd Add up to 8 human player names to the configuration and save/load them to avoid entering them each time.
Avoid a crash when all names are deleted in the multiplayer names editing dialog.
2024-07-17 20:04:20 +03:00
Alexander Wilms
1b3fcbcd8d CMake.md: Use markdown list instead of HTML table 2024-07-17 18:17:55 +02:00
Alexander Wilms
e9f2907efc Merge branch 'develop' into dev-documentation 2024-07-17 18:17:09 +02:00
Laserlicht
4415f645a7 lambda -> function; fix color 2024-07-17 18:07:45 +02:00
Andrii Danylchenko
7571fb7046 NKAI: fix gosolo when human is lead by gosolo AI + multiplayer 2024-07-17 17:09:04 +03:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Alexander Wilms
5712c3f9f4 JsonNode change: Fix test 2024-07-17 15:20:18 +02:00
Alexander Wilms
b605dea6db JsonNode::JsonNode(): Also use reference for fileName argument in method definition 2024-07-17 14:37:58 +02:00
Laserlicht
2dd22c383b make inactive buttons darker 2024-07-17 14:05:14 +02:00
Alexander Wilms
c484244ba0
JsonNode::JsonNode(): Use reference for fileName argument
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-07-17 14:01:13 +02:00
Ivan Savenko
becd13e03d Fix page flip animation playback 2024-07-17 11:57:03 +00:00
Alexander Wilms
434371195d JsonNode constructors: Take fileName as argument
* Don't print JSON in JsonParser::parse() in case of errors
2024-07-17 13:50:59 +02:00
Laserlicht
f0435d8b8e small fix 2024-07-17 13:48:00 +02:00
Laserlicht
f54b84ead9 use spellbook to select 2024-07-17 13:20:17 +02:00
Alexander Wilms
1ca8e9b3ae JsonParser::parse(): Print JSON if there were errors while parsing
In cases where the file name was not specified, the warning messages were not very useful.

Example:

```json
File <unknown> is not a valid JSON file!
At line 33, position 1 warning: Comma expected!

{
        "name" : "New Old Heroes",
        "description" : "New heroes based on old 3DO artwork and other game appearances. Requires Horn of the Abyss.",
        "modType" : "Heroes",
        "version" : "1.2.0",
        "author" : "Aphra",
        "contact" : "",

        "heroes" :
        [
                "config/gwenneth.json",
                "config/balindar.json",
                "config/nicolas.json",
                "config/kastore.json",
                "config/kydoimos.json",
                "config/athe.json",
                "config/miseria.json",
                "config/areshrak.json",
                "config/pactal.json",
                "config/zog.json"
        ],

        "changelog" :
    {
        "1.0.0"   : ["Initial release"],
        "1.1.0"   : ["Added Nicolas Gryphonheart and Kastore"],
        "1.1.1"   : ["Bug fixes"],
        "1.2.0"   : ["Added some HotA portrait-only campaign heroes"]
    },

        "depends" :
                [ "hota.neutralCreatures" ]
        "keepDisabled" : true
}
```
2024-07-17 13:17:43 +02:00
Laserlicht
5562402646 hotkey number from config 2024-07-17 12:37:23 +02:00
Ivan Savenko
cdbb329994
Merge pull request #4280 from Alexander-Wilms/seamless-qsplitter
CModListView::CModListView(): Set background color to window color fo…
2024-07-17 13:23:46 +03:00
Ivan Savenko
1072356002
Merge pull request #4268 from IvanSavenko/pathnode_reduce
Reduce size of CGPathNode and AIPathNode
2024-07-17 13:08:05 +03:00
Ivan Savenko
01b04b4c77
Merge pull request #4285 from Laserlicht/heading-docs
fix headings of md files
2024-07-17 13:06:51 +03:00
Alexander Wilms
f2a1b47229 CModListView::CModListView(): Set background color of QSplitter to window color for seamless appearance 2024-07-17 10:50:39 +02:00
Laserlicht
b8d872aa60 mobile adjustments 2024-07-17 04:24:27 +02:00
Laserlicht
b568e2f628
Merge branch 'vcmi:develop' into quickspell 2024-07-17 03:20:31 +02:00
Laserlicht
d23d4b32c7 cleanup 2024-07-17 01:02:11 +02:00
Laserlicht
0a98169bcf update quick spell panel 2024-07-17 00:55:01 +02:00
Laserlicht
a3874297f5 toggle window 2024-07-17 00:48:22 +02:00
Laserlicht
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
Laserlicht
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
Laserlicht
8f407311fd
fix headings of md files 2024-07-16 20:29:20 +02:00
Ivan Savenko
c9fb2d6aab
Merge pull request #4282 from vcmi/beta
Merge beta -> master
2024-07-16 21:21:01 +03:00
Ivan Savenko
ea93da62da
Merge pull request #4266 from IvanSavenko/release_155
Preparation for release 1.5.5
2024-07-16 19:25:02 +03:00
Ivan Savenko
34b6eaa25e Integrating changes from PR #4251 - add logging for rng 2024-07-16 15:31:58 +00:00
Ivan Savenko
65eeceb7d7 Integrating changes from PR #4251 - allow defining seed for server 2024-07-16 15:12:02 +00:00
Andrii Danylchenko
d243a2fc12
Merge pull request #4259 from vcmi/fix-4203
BattleAI: fix moving to unreachable in case of back-to-back 2-hex
2024-07-16 16:41:50 +03:00
Ivan Savenko
c91f8cd511 Fix tests 2024-07-16 13:13:39 +00:00
Ivan Savenko
1c63fefe02 Moved banks randomization to server-side with client netpack 2024-07-16 13:13:39 +00:00
Ivan Savenko
b07408e984 New objects are now created and initialized on server and sent to client 2024-07-16 13:13:39 +00:00
Ivan Savenko
d2839c8e52 Rewardable object randomization is now always server-sided 2024-07-16 13:13:39 +00:00
Ivan Savenko
388d65d6b2 Fix merge 2024-07-16 13:13:39 +00:00
Ivan Savenko
c4b8778e8b Remove unused code 2024-07-16 13:13:39 +00:00
Ivan Savenko
5178e4842e Moved generation of new rumors to server 2024-07-16 13:13:39 +00:00
Ivan Savenko
55bf75c43e Remove no longer used random seeds from StartInfo 2024-07-16 13:13:39 +00:00
Ivan Savenko
0d66ddbeec GameState now uses random generator from server. Blocked access to rmg
on client
2024-07-16 13:13:38 +00:00
Ivan Savenko
63bcf7d83c Replaced most of usages of CRandomGenerator with vstd::RNG in library 2024-07-16 13:13:07 +00:00
Ivan Savenko
60a51e98de Remove usage of std::function from CRandomGenerator 2024-07-16 13:13:07 +00:00
Ivan Savenko
0e57862f94 Set release date to July, 17th 2024-07-16 13:08:15 +00:00
Ivan Savenko
30569a112c Fix crash on attempt to transfer component of a combined artifact 2024-07-16 13:08:15 +00:00
Ivan Savenko
a09a0d41c3 Added missing option to schemas and docs 2024-07-16 13:08:15 +00:00
Ivan Savenko
69379b6e1b Update changelog 2024-07-16 13:08:15 +00:00
Ivan Savenko
4ad81dcaf8 Version bump to 1.5.5 2024-07-16 13:08:15 +00:00