games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
15,031 Commits 19 Branches 62 Tags 112 MiB
30d9daf62c
Commit Graph

411 Commits

Author SHA1 Message Date
DjWarmonger
3e959f3ad9
Merge pull request #3132 from vcmi/reward_select_all 
Support for "selectAll" reward
 2024-03-14 21:46:02 +01:00
DjWarmonger
2c9b7089ad
Merge pull request #3645 from vcmi/save_rmg_options 
Save rmg options
 2024-03-14 19:54:08 +01:00
Tomasz Zieliński
43a1e691e4 Trying to satisfy Sonarcloud 2024-03-09 10:17:30 +01:00
Tomasz Zieliński
5ca3fd2d9c Restored previous solution, which is handled already. 2024-03-04 21:49:35 +01:00
Tomasz Zieliński
e7af9d5607 Code review fixes, Sonarcloud fixes 2024-03-04 21:23:17 +01:00
Alexander Wilms
ea48257100 Fix SonarCloud issues 
Replace the use of "::value" with "std::is_abstract_v" and similar issues
 2024-03-02 14:08:03 +01:00
Ivan Savenko
00058ea609
Merge pull request #3649 from godric3/map-editor-fix-owner-selection 
Map editor fix owner selection
 2024-03-01 13:34:47 +02:00
Tomasz Zieliński
1b2d01c25f Add new map sizes & better layout 2024-03-01 12:15:04 +01:00
godric3
da91e90a7b map editor: dont suggest neutral owner for hero 2024-02-29 23:08:21 +01:00
godric3
51386db347 map editor: fix owner selection 2024-02-29 22:11:28 +01:00
Tomasz Zieliński
c87b0e6d65 Compile fix 2024-02-29 20:44:14 +01:00
Tomasz Zieliński
17fc1604ca Remove unused file 2024-02-29 20:20:35 +01:00
Tomasz Zieliński
fcbe399541 Cleanup 2024-02-29 20:12:46 +01:00
Tomasz Zieliński
74bd6d6075 Editor save & load template works 2024-02-29 20:05:20 +01:00
Tomasz Zieliński
2c32c770f7 First version that works in lobby 2024-02-29 12:45:08 +01:00
Ivan Savenko
08a27663f9 Reworked JsonNode constructors to more logical form 2024-02-26 12:55:49 +02:00
Ivan Savenko
54796c7c56 Rename toJson to toString/toCompactString for consistency 2024-02-26 12:55:49 +02:00
Ivan Savenko
c3957c2c2a Moved json files to new directory, split on per-class basis 2024-02-14 13:08:24 +02:00
Ivan Savenko
9ebd194ab1
Merge pull request #3609 from IvanSavenko/single_process 
Allow running server as part of client process
 2024-02-14 12:06:22 +02:00
Ivan Savenko
6e399eb21a Make some non-const static variables const or constexpr 2024-02-12 13:22:54 +02:00
Ivan Savenko
a909d7ddde Removed cmake_modules/VCMI_lib macro, use it directly in place 2024-02-11 20:38:24 +02:00
Ivan Savenko
fd17133da3 Fix editor build 2024-02-06 00:40:26 +02:00
godric3
ec735aa959 Fix mine resource and productivity on map load, also made them non editable 2024-02-03 11:30:09 +01:00
godric3
b2cd92d937 Fix initializing map editor mod settings with more than one level of submods 2024-02-03 10:36:47 +01:00
godric3
dd004f0f6e Fix inspector using wrong editor for some values 2024-01-21 21:07:06 +01:00
Ivan Savenko
6b760089a4
Merge pull request #3473 from IvanSavenko/const_lib 
[1.5] Remove non-const global variables from library
 2024-01-20 19:22:46 +02:00
Ivan Savenko
db5539b39d Regenerated Qt translations 2024-01-19 21:21:23 +02:00
Ivan Savenko
ea1f05d15a Stabilization 2024-01-19 13:55:22 +02:00
Ivan Savenko
e67e4430ba Removed most of non-const static fields in lib. Reduced header includes. 2024-01-19 13:55:22 +02:00
Ivan Savenko
a15366f5a5 Make IObjectInterface::cb non-static 2024-01-19 13:55:21 +02:00
Ivan Savenko
d5c4478816 Remove most of non-const access to VLC entities 2024-01-19 13:54:49 +02:00
Ivan Savenko
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
Alexander Wilms
73019c204d Replace redundant types with auto for the lvalues of template factory functions for smart pointers 
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt

import re

with open("redundant_types.txt") as f:
    for line in f:
        line = line.strip()
        path = line.split(":", 1)[0]
        original_code = ":".join(line.split(":")[1:]).strip()

        print()
        print(path)
        print(original_code)
        prefix = "auto "
        if original_code.startswith("static"):
            static = True
        else:
            static = False

        cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
        print(cpp_type)

        if static:
            new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
        else:
            new_code = "auto "+ " ".join(original_code.split(" ")[1:])
        print(new_code)

        if True:
            with open(path, "r") as f:
                filedata = f.read()

            filedata = filedata.replace(original_code, new_code)

            with open(path, "w") as f:
                f.write(filedata)
 2024-01-17 12:50:00 +00:00
Ivan Savenko
e849e4170a
Merge pull request #3486 from Alexander-Wilms/replace-redundant-types-with-auto 
Replace redundant types with `auto`
 2024-01-17 13:31:05 +02:00
Alexander Wilms
1b85abb508 Use auto instead of redundant type in initializations using new 
grep -r --include \*.h --include \*.cpp "=" * | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return\|{\|}\|= \"\|= tr(\|virtual\|void" | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "float\|nullptr" | grep "new" | grep -v "AI/FuzzyLite" | grep \( | grep "= new" > redundant_types.txt

import re

with open("redundant_types.txt") as f:
    for line in f:
        line = line.strip()
        path = line.split(":", 1)[0]
        original_code = line.split(":")[1].strip()
        if "new " in original_code:

            cpp_type = original_code.split(" ")[0]
            if original_code.count(cpp_type) == 2:
                print()
                print(path)
                print(original_code)
                new_code = "auto "+" ".join(original_code.split(" ")[1:])
                print(new_code)

                with open(path, "r") as f:
                    filedata = f.read()

                filedata = filedata.replace(original_code, new_code)

                with open(path, "w") as f:
                    f.write(filedata)
 2024-01-16 21:40:53 +00:00
Alexander Wilms
cca08e29da Remove duplicate semicolons 2024-01-16 19:02:39 +00:00
Tomasz Zieliński
817ab1d53d Actually fix quest artifacts not getting banned at all 2024-01-16 17:16:03 +01:00
Tomasz Zieliński
285bafdbf4 Do not ban heroes in Prisons, they might be rehired after they are defeated. 
Restore hero to pool if Prison fails to be placed.
 2024-01-15 07:41:29 +01:00
kdmcser
f9252f2e90 Update Chinese translation for mapeditor 2024-01-13 17:57:36 +08:00
kdmcser
a2cda7f736 add Chinese mapeditor translation into its CMakeFiles.txt 2024-01-13 17:27:28 +08:00
Ivan Savenko
29eab0fdbe
Merge pull request #3476 from kdmcser/develop 
Add Chinese translate for mapeditor
 2024-01-12 21:54:22 +02:00
kdmcser
1d4862fc83 add Chinese translate for mapeditor 2024-01-12 23:12:54 +08:00
Alexander Wilms
781328f282 Convert C-style casts to the more verbose C++ style 2024-01-10 00:30:35 +00:00
Alexander Wilms
f3277b7953 Define each identifier in a dedicated statement 2024-01-10 00:22:23 +00:00
godric3
78b73961d1 Fix saving map settings (allowed abilities, spells, arts and heroes) 2024-01-09 21:52:11 +01:00
Ivan Savenko
ef5686634d Removed no longer used code 2024-01-04 23:48:58 +02:00
Kryštof Černý
2bf0bb3ca4 cz consisteny 2023-12-29 16:56:04 +01:00
Kryštof Černý
c608a6dbdb
Apply suggestions from code review 
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
 2023-12-29 16:47:56 +01:00
Kryštof Černý
4429b20693 Update desktop files 2023-12-29 12:19:05 +01:00
Kryštof Černý
207b54fc6f Add Czech to cmakelists 2023-12-27 17:20:13 +01:00