1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

14590 Commits

Author SHA1 Message Date
Joakim Thorén
eeab16a57d Enable ccache support for MinGW 2024-01-02 01:59:01 +01:00
Joakim Thorén
4d2423ff81 Add 'ENABLE_COLORIZED_COMPILER_OUTPUT' CMake option for Clang/GNU. This makes it so that compiler output is colorized for better readability. I am not sure if this has performance implications w.r.t console print speed --- hence default is set to 'off'. 2024-01-02 01:52:57 +01:00
Joakim Thorén
100664e019 Fix compilation error where gcc 12.1.0 (MinGW) errors with "writing 1 byte into a region of size 0" 2024-01-02 01:43:49 +01:00
Joakim Thorén
30b851da7c Merge branch 'develop' of https://github.com/vcmi/vcmi into windows_mingw_cmake_presets 2024-01-01 22:53:19 +01:00
Dydzio
fbd988df42 Bit better documentation wording 2024-01-01 21:19:25 +01:00
Dydzio
7cf7543747 Configurable ferocity bonus 2024-01-01 21:16:38 +01:00
Dydzio
898b8f3c71 Add initial version of Ferocity ability (for Ayssids) 2024-01-01 19:58:32 +01:00
Dydzio
9dd1dbfe37
Fix wrong comment 2024-01-01 17:53:05 +01:00
Asirome
133e8d7d3a
Merge pull request #2 from macomarivas/Android-launcher-Spanish-translation
Android launcher Spanish translation
2024-01-01 15:45:15 +01:00
Asirome
e71563c208
Android launcher Spanish translation 2024-01-01 15:43:18 +01:00
Laserlicht
63ee20de6c
video campaign fix 2024-01-01 15:25:42 +01:00
Laserlicht
9066dbcbd4
spellbook fix pages 2024-01-01 14:57:55 +01:00
kdmcser
76388d6085
Update Chinese translation (#3410)
* Update Chinese translate
2023-12-31 22:27:48 +02:00
Ivan Savenko
4cd910a4ce
Merge pull request #3392 from IvanSavenko/simturns_docs
Added description of simultaneous turns functionality to player docs
2023-12-31 12:19:56 +02:00
Ivan Savenko
f5bc1f498a
Merge pull request #3404 from cewbdex/desktop-trans
Update linux desktop files
2023-12-31 12:17:58 +02:00
Ivan Savenko
da9b3299c5
Merge pull request #3399 from Kuxe/ENABLE_STRICT_COMPILATION-compilation_fixes
ENABLE_STRICT_COMPILATION compilation fixes
2023-12-31 12:16:50 +02:00
Ivan Savenko
2c6b1daee5
Merge pull request #3400 from Kuxe/enable_ccache_option_for_linux
Enable ccache option for linux
2023-12-31 12:16:21 +02:00
Joakim Thorén
daf9f9f7f5
Re-add const that was erronously removed with 88ec4fa
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2023-12-30 11:01:21 +01:00
Joakim Thorén
3536e2146e Add 'windows-mingw-release' to CMakePresets.json 2023-12-30 00:30:08 +01:00
Joakim Thorén
8846fba1fc Fixes compilation error "ResourceSet.h:33:21: error: function 'ResourceSet::ResourceSet()' definition is marked dllimport" when building with g++ 12.1.0 2023-12-30 00:29:31 +01:00
Joakim Thorén
88ec4fa0e7 Use getTileThreat-helper instead of directly accessing hitMap with tile coordinates 2023-12-29 23:12:06 +01:00
Joakim Thorén
25be15a023 Use 'REQUIRED' instead of custom error message when ccache is not found 2023-12-29 21:54:58 +01: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
Ivan Savenko
825712a672
Merge pull request #3402 from Laserlicht/beta
bugfix: turn order label empty
2023-12-28 23:07:05 +02:00
Laserlicht
2e7ac8d02d small config fixes 2023-12-28 20:55:37 +01:00
Laserlicht
cb9c4bbaf0 unlimited replay option 2023-12-28 20:48:19 +01:00
Laserlicht
a3e27b859e extra option tab 2023-12-28 19:41:01 +01:00
Laserlicht
f577f4cf6b
bugfix: enable first, then set text 2023-12-28 17:17:01 +01:00
Ivan Savenko
a9005da01e
Merge pull request #3366 from Laserlicht/battle_informations
Battle stacks informations
2023-12-28 12:39:26 +02:00
Joakim Thorén
61314a36f6 Fix copy-paste mistake 2023-12-27 22:35:43 +01:00
Joakim Thorén
01f602ab92 Fixes warning about usage of unused variable 2023-12-27 22:25:29 +01:00
Joakim Thorén
406d136cdc Fixes warnings about possibly dangling references 2023-12-27 22:24:58 +01:00
Joakim Thorén
721c189b20 Replace direct usage of CMAKE_CXX_COMPILER_LAUNCHER with ENABLE_CCACHE in CI 2023-12-27 21:17:56 +01:00
Joakim Thorén
9001124c3a Add linux-gcc-release-ccache and linux-clang-release-ccache 2023-12-27 21:16:34 +01:00
Joakim Thorén
2569e1c661 Update documentation to suggest using option ENABLE_CCACHE instead of directly setting CMAKE_C(XX)_COMPILER_LAUNCHER 2023-12-27 21:13:41 +01:00
Joakim Thorén
fce3b5b83c Remove redundant find_program and if(CCACHE) - if ENABLE_CCACHE is set and the generation hasn't already failed then CCACHE is guaranteed to be set and point to a ccache binary. 2023-12-27 21:12:52 +01:00
Joakim Thorén
7b02750034 ENABLE_CCACHE option is available for all platforms 2023-12-27 21:10:56 +01:00
Laserlicht
207b5a2ed0
backwards compatibility 2023-12-27 20:44:32 +01:00
Ivan Savenko
4a0bf383a1
Merge pull request #3398 from cewbdex/cz-fix
Add Czech to cmakelists
2023-12-27 19:32:56 +02:00
Kryštof Černý
207b54fc6f Add Czech to cmakelists 2023-12-27 17:20:13 +01:00
Laserlicht
c471b626a2
code review 2023-12-27 15:26:08 +01:00
Laserlicht
fc4827c89c
option for allowing cheats 2023-12-27 14:39:35 +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
f4792c2397
Merge pull request #3390 from Laserlicht/launcher
[Launcher] remove list in settings window
2023-12-25 23:01:37 +02: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