games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-05 13:04:54 +02:00
Code Issues Releases Activity
16,390 Commits 21 Branches 67 Tags
Commit Graph

16390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Wilms
70e309c4f9
CModListView::loadScreenshots(): Check isValid() instead of row() and column() 
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
 2024-07-19 12:38:42 +02:00
Alexander Wilms
4f06aed631 CModListView::loadScreenshots(): Ensure a mod is selected in allModsView 
Fixes #989
Fixes #3811
 2024-07-18 22:33:48 +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
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
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
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
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
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
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
1.5.5 		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
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
Ivan Savenko
7328c9ffd6 Fix path and music not updating on new turn 2024-07-16 13:08:15 +00:00
Ivan Savenko
9f925565a3
Merge pull request #4279 from kdmcser/beta 
update Chinese translation
 2024-07-16 16:08:00 +03:00
kdmcser
cbf094db68 update Chinese translation 2024-07-16 20:53:41 +08:00
Ivan Savenko
e4be4c3061 Fix playback of 8-bit audio found in h3intro.smk in some version not 
from gog.com
 2024-07-16 12:49:24 +00:00
Ivan Savenko
29d3de2807 Fix missing video on winning the battle 2024-07-16 11:41:40 +00:00
Ivan Savenko
e59880a37c Remove unnecessary logging 2024-07-16 09:53:56 +00:00
Ivan Savenko
a273eb6413 Fix crash on attempt to play audio from video without such stream 2024-07-16 09:53:56 +00:00
Ivan Savenko
ad9750ed3e
Merge pull request #4186 from SoundSSGood/end-of-battle-artifacts-transfer 
End of battle artifacts transfer
 2024-07-16 12:45:13 +03:00
Ivan Savenko
696cce7f7f
Merge pull request #4253 from smanolloff/random-port 
Bind VCMI server to a random TCP port
 2024-07-16 12:25:29 +03:00
Ivan Savenko
f833f13251
Merge pull request #4260 from vcmi/nullkiller-docs 
Add docs for Nullkiller AI
 2024-07-16 12:24:34 +03:00
Ivan Savenko
fd04320815
Merge pull request #4267 from IvanSavenko/sonar_fix 
Fixed new issues detected by SonarCloud
 2024-07-16 12:23:08 +03:00
Ivan Savenko
7e88c88ef0
Merge pull request #4262 from Alexander-Wilms/missing-prompt-after-quitting 
Fix missing terminal prompt after quitting
 2024-07-16 12:22:42 +03:00
Ivan Savenko
8e8d640923
Merge pull request #4276 from Alexander-Wilms/jsonparser-err-newline 
JsonParser::error(): Don't add trailing newline
 2024-07-16 12:21:23 +03:00
Ivan Savenko
4ce552369f
Merge pull request #4273 from Alexander-Wilms/gitignore-dolphin-directory 
Add .directory files to .gitignore
 2024-07-16 12:20:48 +03:00
Ivan Savenko
f920e94366
Merge pull request #4210 from Laserlicht/graphics_improvements 
[1.6] Graphics improvements
 2024-07-16 12:17:39 +03:00
Ivan Savenko
3134d8383c
Merge pull request #4207 from Laserlicht/map_format_additional 
[1.6] Map format additional infos
 2024-07-16 12:15:58 +03:00
Ivan Savenko
4224f31fa6
Merge pull request #4252 from altiereslima/beta 
Update Portuguese Translation
 2024-07-16 12:15:25 +03:00
Ivan Savenko
4e48d70537
Merge pull request #4265 from dydzio0614/alternative-actions-fix 
Fix alternative actions to support more than 2 actions + simplify logic
 2024-07-16 12:14:46 +03:00