games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
17,136 Commits 19 Branches 62 Tags 110 MiB
f4578c6d3a
Commit Graph

17136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xilmi
b0f37748d6 Merge remote-tracking branch 'upstream/develop' into develop 2024-07-16 15:47:59 +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
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
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