1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-10 09:50:17 +02:00
Commit Graph

14547 Commits

Author SHA1 Message Date
Ivan Savenko
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
Ivan Savenko
dceae7398c
Merge pull request #3518 from vcmi/beta
Merge beta -> master
2024-01-18 22:51:36 +02:00
Ivan Savenko
69e87f929b
Merge pull request #3516 from IvanSavenko/release_143
Release 1.4.3
2024-01-18 22:35:42 +02:00
Ivan Savenko
1c154a0d96
Merge pull request #3517 from dydzio0614/polish-language-update
Update polish translation
2024-01-18 22:35:29 +02:00
Dydzio
6a5620e06e Update polish translation 2024-01-18 21:25:17 +01:00
Ivan Savenko
9be0dcf456 Translate missing line 2024-01-18 22:21:32 +02:00
Ivan Savenko
b2527c3775 Do not attempt to answer non-existing query 2024-01-18 22:21:07 +02:00
Ivan Savenko
3d62863ce6 Add 1.4.3. download counter 2024-01-18 17:18:56 +02:00
Ivan Savenko
8d43343c94 Updated changelog 2024-01-18 17:18:42 +02:00
Ivan Savenko
9da60a2738 Updated Ukrainian translation 2024-01-18 17:18:31 +02:00
Ivan Savenko
c31d52bff6 Added new bonus icon 2024-01-18 17:18:13 +02:00
Ivan Savenko
cf9a4a580b
Merge pull request #3513 from Laserlicht/hide_adventuremap
hide adventuremap
2024-01-18 16:42:03 +02:00
Ivan Savenko
7d7b86ebc2
Merge pull request #3503 from IvanSavenko/changelog_143
[1.4.3] Changelog
2024-01-18 16:24:28 +02:00
Ivan Savenko
3e8f110482
Merge pull request #3515 from SoundSSGood/backpack-statusbar
Backpack statusbar
2024-01-18 16:05:42 +02:00
Ivan Savenko
b698b6e79d
Merge pull request #3512 from Alexander-Wilms/use-auto-with-template-factory-functions-for-smart-pointers
Use auto with template factory functions for smart pointers
2024-01-18 16:05:05 +02:00
Ivan Savenko
9025744cc5
Merge pull request #3510 from Alexander-Wilms/remove-semicolons-from-macros
Remove trailing semicolons from more macros
2024-01-18 16:03:55 +02:00
Ivan Savenko
b1bd44de1e
Merge pull request #3298 from vcmi/random_prison_distributor
Fixes to hero / prison distribution
2024-01-18 16:03:08 +02:00
SoundSSGood
a753319ad0 backpack window statusbar 2024-01-18 15:55:54 +02:00
SoundSSGood
8d4b74b441 Assembling in backpack fixed 2024-01-18 12:49:08 +02:00
Laserlicht
a1f4fcb78a
hide adventuremap 2024-01-18 00:47:18 +01:00
Alexander Wilms
b364f707cd Fix issues introduced by automated replacement of redundant types 2024-01-17 20:12:57 +00:00
Alexander Wilms
7a1cee1a60 Fix error: 'auto' not allowed in non-static struct member 2024-01-17 14:49:28 +00:00
Alexander Wilms
57c51b62fd Fix CGameHandler.cpp:1026:4: error: function 'getAllowedSpells' with deduced return type cannot be used before it is defined 2024-01-17 14:41:53 +00:00
Alexander Wilms
271eeca11b Fix BattleEvaluator.cpp:286:32: error: function 'battleGetAllObstacles' with deduced return type cannot be used before it is defined 2024-01-17 14:41:47 +00:00
Alexander Wilms
f08c6d1ce9 Fix issues created by type replacement script 2024-01-17 14:33:02 +00: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
Ivan Savenko
d64473b894
Merge pull request #3511 from Laserlicht/german_update
update german
2024-01-17 13:29:31 +02:00
DjWarmonger
4f28cd42b7
Update lib/rmg/modificators/PrisonHeroPlacer.h
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2024-01-17 10:11:55 +01:00
DjWarmonger
91a20c2bfd
Update lib/rmg/CMapGenerator.h
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2024-01-17 10:11:50 +01:00
Tomasz Zieliński
66efb07e52 More 2024-01-17 07:45:53 +01:00
Tomasz Zieliński
a568a9b3fb Fix lambda capture 2024-01-17 07:26:51 +01:00
Tomasz Zieliński
253f1dc7e6 Refactor duplicated code as suggested by SonarCloud 2024-01-17 07:18:14 +01:00
Alexander Wilms
24b5f3f552 Fix CQuest.h:101:2: error: 'auto' not allowed in non-static class member 2024-01-16 21:46:25 +00:00
Laserlicht
85294f5990
update german 2024-01-16 22:45:12 +01: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
558ead41fe Add missing semicolon after macro usage 2024-01-16 20:18:18 +00:00
Ivan Savenko
93b0838e45
Merge pull request #3509 from Alexander-Wilms/remove-duplicate-semicolons
Remove duplicate semicolons
2024-01-16 22:16:46 +02:00
Ivan Savenko
ff36ef9f5c Initial version of 1.4.3 changelog 2024-01-16 22:00:40 +02:00
Ivan Savenko
bf62e47481
Merge pull request #3505 from IvanSavenko/bugfixing
[1.4.3] Bugfixing
2024-01-16 22:00:11 +02:00
Alexander Wilms
ccac73fb69 Remove trailing semicolons from more macros 2024-01-16 19:46:21 +00:00
Ivan Savenko
723a95f770 Add assertions to detect invalid calls 2024-01-16 21:12:57 +02:00
Alexander Wilms
cca08e29da Remove duplicate semicolons 2024-01-16 19:02:39 +00:00
Tomasz Zieliński
afc9bd908c Unused capture 2024-01-16 17:38:36 +01:00
Tomasz Zieliński
aa5bb27d20 Style 2024-01-16 17:16:15 +01: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
71844d4d92 Unban artifacts if RMG fails to place Seer Hut (unlikely) 2024-01-16 17:15:35 +01:00
Ivan Savenko
6270c81c1a Add logging to trace crash 2024-01-16 15:21:49 +02:00
Ivan Savenko
1194419884 Added option to allow self-casting 2024-01-16 15:13:00 +02:00
Ivan Savenko
c3012105e2 Fix duplicated hero in Song for the Father campaign 2024-01-16 14:45:38 +02:00