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

485 Commits

Author SHA1 Message Date
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
Alexander Wilms
a8ff11ad74 Remove redundant mention of GPL 2 or later from metainfo description 2023-10-14 14:16:50 +00:00
Alexander Wilms
01aa288b72 Link to Discord instead of Slack in metainfo 2023-10-14 14:07:05 +00:00
Fabrice Tiercelin
99221c2d56 Fix Chinese translation 2023-10-04 21:04:06 +02:00
Nordsoft91
041ffceb07
Merge pull request #2952 from Alexander-Wilms/develop
Enable VSync to prevent screen tearing while scrolling across map
2023-10-01 14:08:00 +02:00
Alexander Wilms
e33127a1f7 Launcher setting: Disable spinBoxFramerateLimit if VSync is enabled 2023-09-26 18:55:25 +02:00
Alexander Wilms
23d1638d70 Add VSync to settings 2023-09-26 18:55:25 +02:00
Ivan Savenko
b89fa254fc
Merge pull request #2921 from vdhan/develop
add Vietnamese
2023-09-25 12:34:00 +03:00
An Vu
b8eba01b7d add Launcher and Map Editor 2023-09-24 21:09:09 +07:00
nordsoft
c73c9d773c Fix issue with impossible room ready status 2023-09-24 03:15:10 +02:00
Nordsoft91
ec582328b4
Merge pull request #2887 from Laserlicht/campaign_improvement
campaign improvements
2023-09-22 01:01:59 +02:00
Laserlicht
530e4533ce
Update mainwindow_moc.cpp 2023-09-21 22:05:15 +02:00
nordsoft
75d97e86e4 Show progress for mod extraction 2023-09-19 23:38:00 +02:00
Alexander Wilms
1c20431035 Use 64px and 32px as icon sizes in launcher sidebar 2023-09-17 15:52:20 +00:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
115c30f42c Preparation for 1.3.2 release 2023-09-14 14:57:43 +03:00
Ivan Savenko
e4aa981925 Add more logging to mod downloading process 2023-09-12 21:15:14 +03:00
Ivan Savenko
fc6fc31a02
Merge pull request #2565 from IvanSavenko/documentation
(1.3.2) Documentation import
2023-09-12 13:13:52 +03:00
nordsoft
18c44fc006 Cache archive files 2023-09-09 10:59:29 +02:00
nordsoft
0db51e0517 Minor fixes for lobby 2023-09-09 10:59:29 +02:00
Nordsoft91
d6ff553cac
Fix typo 2023-09-09 02:14:27 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan Savenko
72858cd0d8
Merge pull request #2768 from IvanSavenko/cherry_picked_fixes
(1.3.2) Cherry picked fixes
2023-09-08 13:15:34 +03:00
nordsoft
bb4905af48 Change resourceID with ResourcePath 2023-09-08 01:54:29 +02:00
nordsoft
8c94d082c8 Merge remote-tracking branch 'upstream/develop' into launcher-size-support 2023-09-08 01:51:52 +02:00
Nordsoft91
43ef20efc5
Merge pull request #2748 from Nordsoft91/lobby-chat
Advanced chat in lobby
2023-09-07 22:01:43 +04:00
nordsoft
40ea45498f Rename 2023-09-07 19:57:57 +02:00
Ivan Savenko
33bf367dc0 Updated docs and all internal links 2023-09-07 12:57:03 +03:00
Ivan Savenko
b85a2f99c1 Quick fix to avoid freeze on Launcher startup / mod repo checkout 2023-09-06 01:11:18 +03:00
Alexander Wilms
c0f0211098 Update VCMI icon (#2672)
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
2023-09-05 23:57:19 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
nordsoft
96d244a315 Fix compiling 2023-09-03 18:28:22 +04:00
nordsoft
1f9bec32a1 Maybe ununsed 2023-09-03 17:55:16 +04:00
nordsoft
b0105e8a3a Channels support 2023-09-03 16:47:34 +04:00
nordsoft
ef853ab96d Move chat logic to separate class 2023-09-03 03:05:48 +04:00
nordsoft
d0b3567447 Advanced chat 2023-09-03 01:46:25 +04:00
nordsoft
75258baefc Chat minor improvements 2023-09-02 22:53:44 +04:00
Nordsoft91
9af73c2212
Merge pull request #2723 from Nordsoft91/versions-fix
Launcher & lib versions unification
2023-09-02 19:42:46 +04:00
Nordsoft91
48e6e0228c
Merge pull request #2722 from Nordsoft91/launcher-doubleclick
Launcher mod double click behavior
2023-09-02 19:42:28 +04:00
nordsoft
32ad463170 Rename 2023-09-02 14:15:37 +04:00
Nordsoft91
348b6b0f32
Update launcher/modManager/cmodlistview_moc.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-09-02 14:11:56 +04:00
nordsoft
1ef407ea9f Fixes 2023-09-02 14:10:50 +04:00
nordsoft
4024a44b7e Unify internal units 2023-09-02 00:18:23 +04:00