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

628 Commits

Author SHA1 Message Date
Laserlicht
d7465e75c4 make it possible to use different file names 2024-04-13 20:38:10 +02:00
Laserlicht
de9dbf0cd7 introduce innoextract 2024-04-13 17:19:47 +02:00
altiereslima
d29b2f098f Update portuguese.ts 2024-04-07 14:55:25 -03:00
altiereslima
a4bbdb2b4d Update portuguese.ts 2024-04-07 14:36:24 -03:00
altiereslima
5b012c009b Update CMakeLists.txt 2024-04-07 14:17:14 -03:00
altiereslima
5f3bd2963e VCMI Portuguese Brazilian 2024-04-07 11:55:56 -03:00
Evgeny Malygin
ee42527ee1
Fixes 2024-03-29 12:28:14 +02:00
Evgeny Malygin
25125f96da
Fix: licenses, pragma guards, StdInc 2024-03-29 07:48:52 +02:00
Andrey Filipenkov
74ecbec1c7 get rid of CLauncherDirs global static
std::call_once causes crash
2024-03-20 05:52:25 +03:00
Andrey Filipenkov
1b69410bbc
also remove the declaration from the header 2024-03-02 17:35:28 +03:00
Andrey Filipenkov
5dddb7ed00
remove no longer used slot 2024-03-02 17:27:15 +03: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
Alexander Wilms
73a1a188d9 Update metainfo to conform to AppStream 1.0 spec 2024-02-23 19:26:38 +01: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
2540685c62 Fix invalid check 2024-02-12 12:32:53 +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
f2ecd4cf11 Merge branch 'develop' into 'lobby' 2024-02-11 16:13:13 +02:00
Tytannial
a6cfacc7e3 Update Chinese Launcher translation 2024-02-07 09:01:55 +08:00
Ivan Savenko
322c5faf63 Merge remote-tracking branch 'vcmi/develop' into lobby 2024-01-26 16:52:23 +02:00
Ivan Savenko
2a193effcc Merge branch 'master' into 'develop' 2024-01-25 16:23:13 +02:00
Ivan Savenko
aff9fddd03 Version bump to 1.4.5 2024-01-23 13:56:28 +02:00
Asirome
183612d32b Updated spanish.ts translation 2024-01-23 13:48:51 +02:00
Ivan Savenko
be47c66c57 Ignore hidden mods when checking mod dependencies 2024-01-23 12:57:38 +02:00
Asirome
334020b077
Updated spanish.ts translation 2024-01-23 11:11:35 +01:00
Ivan Savenko
93d78edfb9 Fix build 2024-01-19 23:52:28 +02:00
Ivan Savenko
9fb7d2817a Implemented connection of match server to global lobby 2024-01-19 23:52:28 +02:00
Ivan Savenko
c4db99a60d Removed old in-launcher lobby 2024-01-19 23:52:25 +02:00
Ivan Savenko
db5539b39d Regenerated Qt translations 2024-01-19 21:21:23 +02:00
Ivan Savenko
f067f4e001 Version bump to 1.5.0 2024-01-19 21:21:22 +02:00
Ivan Savenko
339fad6e27
Merge pull request #3528 from vcmi/master
Merge master -> develop
2024-01-19 21:19:20 +02:00
Ivan Savenko
b5ef782fe1 Fix key value to match specs 2024-01-19 17:31:53 +02:00
Ivan Savenko
2886d421ab Version bump 2024-01-19 16:18:13 +02:00
Ivan Savenko
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +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
Ivan Savenko
b08462d555 Change default SDL driver name from opengl to empty (autoselection) 2024-01-14 14:29:13 +02:00
kdmcser
f3c89d0019 Update Chinese translation for launcher 2024-01-13 13:17:03 +08:00
Ivan Savenko
4ef7f93514
Merge pull request #3442 from Laserlicht/autodetect_windows
Autodetect and copy installed heroes on windows
2024-01-10 16:37:55 +02:00
Alexander Wilms
f3277b7953 Define each identifier in a dedicated statement 2024-01-10 00:22:23 +00:00
Laserlicht
152a43abe0
Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-01-06 22:34:02 +01:00
Laserlicht
89236987ce
no silent install 2024-01-06 14:50:00 +01:00
Laserlicht
33efcbac35
fix deprecated 2024-01-06 00:04:01 +01:00
Laserlicht
eca1dba750 autodetect windows 2024-01-05 23:56:17 +01:00
Ivan Savenko
d4d2ad5f1f Fix build 2024-01-05 22:30:07 +02:00
Ivan Savenko
0acf65af17 Use QSignalBlocker in launcher where applicable 2024-01-05 22:06:07 +02:00
Ivan Savenko
0584591e01 Update translations 2024-01-05 21:47:13 +02:00
Ivan Savenko
77d54e1f79 Allow selecting driver in Launcher 2024-01-05 21:47:03 +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
Ivan Savenko
361b584186
Merge pull request #3393 from Laserlicht/mod_drag
[Launcher] mod manager drag'n'drop
2023-12-26 15:33:50 +02:00
Ivan Savenko
08a8982117
Merge pull request #3395 from IvanSavenko/version_bump_143
Version bump to 1.4.3
2023-12-26 15:33:30 +02:00
Laserlicht
dcf9c78a2e
code review 2023-12-25 22:41:15 +01:00
Ivan Savenko
41cdabdcc2 Version bump to 1.4.3 2023-12-25 23:00:39 +02:00
Laserlicht
67568b2b48
add else 2023-12-25 19:48:28 +01:00
Laserlicht
b1f15983de
code review 2023-12-25 19:30:40 +01:00
Laserlicht
c2570adad6
mod manager drag'n'drop 2023-12-25 18:53:02 +01:00
Laserlicht
8e6017ed97
remove left list in settings 2023-12-25 03:26:51 +01:00
Ivan Savenko
e81f4b04cf Set 1.4.2 release date to 25th December 2023-12-24 19:29:33 +02:00
Ivan Savenko
c4cecbb5dc Bump version to 1.4.2 2023-12-20 16:27:18 +02:00
Ivan Savenko
a507acea59
Merge pull request #3331 from cewbdex/linux-translate
Translate metainfo
2023-12-20 16:25:43 +02:00
Kryštof Černý
a34e4ca41d
Apply suggestions from code review
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2023-12-19 18:56:03 +01:00
Laserlicht
884702dbca
Update launcher/eu.vcmi.VCMI.metainfo.xml
Co-authored-by: Alexander Wilms <Alexander-Wilms@users.noreply.github.com>
2023-12-19 00:11:40 +01:00
Ivan Savenko
3f089cce78
Merge pull request #3341 from IvanSavenko/fix_extraction_progress
Fix extraction progress display for mod installation
2023-12-18 13:34:37 +02:00
Laserlicht
62b1d05146
german metainfo 2023-12-18 00:20:47 +01:00
Laserlicht
0b82f6954f
select first language 2023-12-17 23:48:21 +01:00
Ivan Savenko
1a4bcfadbc Actually show extraction progress during mod installation 2023-12-18 00:34:00 +02:00
Ivan Savenko
74dedc4cc5 Converted ZipArchive namespace into stateful class 2023-12-18 00:33:32 +02:00
Ivan Savenko
c04efa8ac4
Merge pull request #3310 from cewbdex/cz-adw
Czech language improvements
2023-12-17 22:38:47 +02:00
Kryštof Černý
11fc2df9a6 Fix missing release 2023-12-17 14:04:17 +01:00
Kryštof Černý
ebf117c729 Use tabs 2023-12-17 11:47:02 +01:00
Kryštof Černý
e1628d2bca Translate metainfo 2023-12-17 11:08:39 +01:00
Kryštof Černý
b5ca7dd421 Fixes 2023-12-14 11:16:33 +01:00
Kryštof Černý
f12d7591fe UI translated and improvements 2023-12-13 21:57:37 +01:00
Ivan Savenko
a74d20b724 Update release date 2023-12-11 18:23:52 +02:00
Ivan Savenko
a1a317aef4
Merge pull request #3280 from IvanSavenko/hotfix
[1.4.1] Hotfixes
2023-12-10 22:43:05 +02:00
Ivan Savenko
705718abc1 Do not alter case of mod description 2023-12-10 19:16:45 +02:00
Ivan Savenko
adb720c8ea Bump version to 1.4.1 2023-12-09 19:03:05 +02:00
Ivan Savenko
07dd958f3c Updated 1.4.0 release date 2023-12-07 23:57:01 +02:00
Dydzio
e330a8d2be Merge branch 'beta' into polish-translation-1.4 2023-12-07 17:49:59 +01:00
Dydzio
c71b89ac02 Update launcher translations 2023-12-07 17:49:32 +01:00
Laserlicht
4318e94bd0
regenerate translations; german update 2023-12-03 20:18:22 +01:00
Ivan Savenko
c717bb5504 Always convert mod ID to lower case before using it 2023-11-19 20:44:28 +02:00
nordsoft
e82df8c726 Better solution 2023-11-07 20:10:07 +02:00
nordsoft
f10416be06 Do not show entries without name 2023-11-07 20:09:41 +02:00
gamestales-com
afc0d8665a #3151-windows-build-symlinks 2023-11-06 15:57:39 +01:00
Ivan Savenko
71d6c4e953 Correctly initialize current value of allied AI in Launcher 2023-11-01 16:57:17 +02:00
Alexander Wilms
9e1629fb40 launcher/modManager/cmodlist.cpp: Member functions that don't mutate their objects should be declared "const" 2023-10-28 16:44:58 +00:00
Alexander Wilms
d686d40bb4 launcher/firstLaunch/firstlaunch_moc.cpp: "static" members should be accessed statically 2023-10-28 15:44:17 +00:00
Alexander Wilms
f01ec55d21 Use the "nullptr" literal.
"nullptr" should be used to denote the null pointer
2023-10-27 18:18:59 +00:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Ivan Savenko
7e034814c1 Partially revert "Translation" type changes to avoid breaking mods 2023-10-22 16:51:08 +03:00
Ivan Savenko
b0d2342c66 Updated Ukrainian translation 2023-10-22 00:23:58 +03:00
Ivan Savenko
50a0ed03db Regenerated launcher translations 2023-10-22 00:17:51 +03:00
Ivan Savenko
adf58fa834 Hide not installed translation mods to languages other than selected one 2023-10-22 00:07:21 +03:00
Ivan Savenko
b50ebba1ba Added mod type "Compatibility" that is hidden in launcher 2023-10-21 23:55:20 +03:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00