games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Code Issues Releases Activity
16,347 Commits 19 Branches 61 Tags 108 MiB
b605dea6db
Commit Graph

16347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Alexander Wilms
f22a3d6168
JsonParser::error(): Use empty() 
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
 2024-07-16 10:30:00 +02:00
Alexander Wilms
466318b77b JsonParser::error(): Don't add trailing newline 2024-07-15 23:58:56 +02:00
SoundSSGood
ff5ddd76b7 suggestions 2024-07-16 00:03:06 +03:00
Alexander Wilms
fb51dfb653 Add .directory files to .gitignore 
KDE's file manager Dolphin will create a hidden .directory file in each folder one changes view properties for
 2024-07-15 20:32:16 +02:00
Ivan Savenko
04a81fee87 Reduce size of CGPathNode and AIPathNode 2024-07-15 07:49:04 +00:00
Ivan Savenko
c00a1e1b0c Fixed new issues detected by SonarCloud 2024-07-15 07:46:40 +00:00
Laserlicht
6aa7c9ebf9
code review 2024-07-15 00:51:41 +02:00
Alexander Wilms
f9de3b2ffd startExecutable(): Restore error handling 2024-07-14 21:04:36 +02:00
Alexander Wilms
875a8cc11a startExecutable(): Use QProcess::start() instead of QProcess::startDetached() to fix the missing prompt after quitting vcmiclient or vcmieditor 
vcmilauncher is now hidden while the child process is running, since it doesn't get repainted.

Fixes #2574
 2024-07-14 21:04:36 +02:00
Andrii Danylchenko
58add0e182
Add docs for Nullkiller AI 2024-07-14 17:45:41 +03:00
Andrii Danylchenko
a4b6fc75dd BattleAI: fix moving to unreachable in case of back-to-back 2-hex 2024-07-14 11:46:45 +03:00
Andrii Danylchenko
6f5710e809
Merge pull request #4110 from vcmi/rewardables 
NKAI: rewardables
 2024-07-14 09:02:37 +03:00
Simeon Manolov
d997d18438
remove debug line 2024-07-12 15:41:07 +03:00
Simeon Manolov
4be7adbf0a
add missing include 2024-07-12 15:26:31 +03:00
Simeon Manolov
5b6bc10131
Code review 2024-07-12 14:54:28 +03:00
Ivan Savenko
74723bf77e
Merge pull request #4254 from smanolloff/fix-battle-queue 
Fix battle turn order for current turn
 2024-07-12 14:45:15 +03:00
Simeon Manolov
941cd6768f
Fix battle turn order for current turn 2024-07-12 11:39:57 +03:00
Simeon Manolov
9d73b50979
Bind server to a randomly assigned port 2024-07-12 01:06:36 +03:00
Ivan Savenko
6b8f94e6e7 Merge remote-tracking branch 'vcmi/master' into develop 2024-07-11 17:43:44 +00:00
Ivan Savenko
286a70c007
Merge pull request #4250 from vcmi/beta 
Merge beta -> master
 2024-07-11 15:13:26 +03:00
Ivan Savenko
006fadb82c
Merge pull request #4247 from IvanSavenko/release_154 
Preparations for release 1.5.4
 2024-07-11 11:45:27 +03:00
Ivan Savenko
143fcb7907
Merge pull request #4249 from kambala-decapitator/install-file-async 
call Install From File button handler asynchronously
 2024-07-11 11:45:18 +03:00
Ivan Savenko
fd297f08e2 Add quick workaround for loading identifiers from difficulty bonuses 2024-07-10 22:33:09 +00:00
Andrey Filipenkov
98cda246a2 [launcher] call Install From File button handler asynchronously 2024-07-10 21:41:26 +03:00
Ivan Savenko
b2729f2661 Updated changelog 2024-07-10 14:41:19 +00:00
Xilmi
98415e98da Spellcasting-bug-fix 
Fixed a bug that prevented the AI from using spells when attacking an enemy settlement that has towers.
The bug was caused by noticing how greatly effective spells would be against towers but not being able to actually target them.
By skipping invalid targets, this no longer is an issue.
 2024-07-10 14:36:35 +00:00
Ivan Savenko
92d32c4573 Add downloads counter for 1.5.4. Remove some older ones since they won't 
fit into a single row
 2024-07-10 14:36:24 +00:00
Ivan Savenko
ef68bd7ac0 Show message to player and close game if creature battle animation is 
missing (demo assets usage?)
 2024-07-10 14:36:24 +00:00
Ivan Savenko
bd10f2d939 Updated Ukrainian translation 2024-07-10 14:36:24 +00:00
Ivan Savenko
dbc227da04 Fix incorrect tooltip when right-clicking Witch Hut if selected hero 
already has this skill
 2024-07-10 14:36:24 +00:00
Ivan Savenko
22870c4764 Fix potential crash on right-clicking object that gives secondary skills 
such as Witch Hut when town is selected
 2024-07-10 14:36:24 +00:00