1
0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-16 09:28:24 +02:00

Merge branch 'develop' into 'lobby'

This commit is contained in:
Ivan Savenko
2024-02-11 16:13:13 +02:00
141 changed files with 908 additions and 514 deletions
+9 -1
View File
@@ -304,7 +304,7 @@
"type" : "object",
"additionalProperties" : false,
"default" : {},
"required" : [ "speedFactor", "mouseShadow", "cellBorders", "stackRange", "movementHighlightOnHover", "rangeLimitHighlightOnHover", "showQueue", "swipeAttackDistance", "queueSize", "stickyHeroInfoWindows", "enableAutocombatSpells", "endWithAutocombat" ],
"required" : [ "speedFactor", "mouseShadow", "cellBorders", "stackRange", "movementHighlightOnHover", "rangeLimitHighlightOnHover", "showQueue", "swipeAttackDistance", "queueSize", "stickyHeroInfoWindows", "enableAutocombatSpells", "endWithAutocombat", "queueSmallSlots", "queueSmallOutside" ],
"properties" : {
"speedFactor" : {
"type" : "number",
@@ -354,6 +354,14 @@
"endWithAutocombat" : {
"type": "boolean",
"default": false
},
"queueSmallSlots" : {
"type": "number",
"default": 10
},
"queueSmallOutside" : {
"type": "boolean",
"default": false
}
}
},