Laserlicht
994a065e29
change naming
2024-07-19 17:58:06 +02:00
Laserlicht
ac30f7757b
changed naming
2024-07-19 11:41:00 +02:00
Laserlicht
68213eb5a0
touch tutorial only if touch used
2024-07-19 04:16:43 +02:00
Laserlicht
26b164b7ca
change naming
2024-07-19 03:44:45 +02:00
Laserlicht
fb980bdb74
fix
2024-07-19 03:28:33 +02:00
Laserlicht
76fc821f82
click also change of modi; haptic only with touch
2024-07-19 03:16:56 +02:00
Laserlicht
5dae5ed30e
input modi detection
2024-07-19 03:00:19 +02:00
Ivan Savenko
31caf73383
Merge pull request #4020 from Laserlicht/quickspell
...
[1.6] Quickspell support
2024-07-18 23:04:05 +03:00
Laserlicht
9ac7db24ca
Merge branch 'develop' into quickspell
2024-07-18 21:24:42 +02:00
Ivan Savenko
d02251f6a8
Merge pull request #4263 from Alexander-Wilms/json-error
...
JsonParser::parse(): Print file name if there were errors while parsing
2024-07-18 21:28:44 +03:00
Ivan Savenko
d55c4e3973
Merge pull request #4275 from IvanSavenko/music_modding
...
Additional options for music modding
2024-07-18 21:28:04 +03:00
Ivan Savenko
69039b5123
Merge pull request #4264 from Alexander-Wilms/dev-documentation
...
Improve Linux developer documentation
2024-07-18 21:27:41 +03:00
Ivan Savenko
37284efd74
Merge pull request #4278 from IvanSavenko/video_fixes
...
Video playback fixes
2024-07-18 21:18:39 +03:00
Andrii Danylchenko
e227fa1691
Merge pull request #4292 from vcmi/nkai-reduce-double-army-losses
...
NKAI: reduce double army loss cases
2024-07-18 18:50:14 +03:00
Andrii Danylchenko
37dc2a38e8
NKAI: reduce double army loss cases
2024-07-18 13:38:25 +03:00
Andrii Danylchenko
73ea0ce7bc
Merge pull request #4289 from vcmi/fix-gosolo-for-multiplayer
...
NKAI: fix gosolo when human is lead by gosolo AI + multiplayer
2024-07-18 08:02:16 +03:00
Laserlicht
e629b7a371
reduce to 12 with gap
2024-07-17 19:26:18 +02: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
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
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
