1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Commit Graph

14301 Commits

Author SHA1 Message Date
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
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
kdmcser
76388d6085 Update Chinese translation (#3410)
* Update Chinese translate
2023-12-31 22:27:48 +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
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
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
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
bb6179d05e Merge pull request #3391 from vcmi/master
Merge master -> develop
2023-12-25 13:00:17 +02:00
Ivan Savenko
a577a7466b Merge pull request #3388 from vcmi/beta
Merge beta -> master
1.4.2
2023-12-24 23:53:50 +02:00
Ivan Savenko
03e3e28b65 Merge pull request #3386 from IvanSavenko/release_142
Release 1.4.2
2023-12-24 23:53:05 +02:00
Ivan Savenko
0c177ced42 Disable lobby reconnection logic due to deadlock on shutdown 2023-12-24 22:31:02 +02:00
Ivan Savenko
4835a1f695 Fix possible crash on abandoned mine with no valid resources 2023-12-24 22:05:47 +02:00
Ivan Savenko
28a3deb42b Do not allow stealing input focus from ourselves 2023-12-24 22:01:22 +02:00
Ivan Savenko
8c4de0d093 Update Ukrainian localization 2023-12-24 19:29:33 +02:00
Ivan Savenko
a001f4e407 Fix crash on reveal puzzle cheat 2023-12-24 19:29:33 +02:00
Dydzio
b5f56f29fa Translate new settings to polish 2023-12-24 19:29:33 +02:00
Ivan Savenko
0eb6e8cc2b Updated changelog with latest changes 2023-12-24 19:29:33 +02:00
Ivan Savenko
7efb141c50 Version bump for Android 2023-12-24 19:29:33 +02:00
Ivan Savenko
274bd3ac22 Add downloads counter for 1.4.2 2023-12-24 19:29:33 +02:00
Ivan Savenko
e81f4b04cf Set 1.4.2 release date to 25th December 2023-12-24 19:29:33 +02:00
Ivan Savenko
161fc6eb58 Merge pull request #3344 from cewbdex/czech-work
More Czech translation work
2023-12-24 19:28:29 +02:00
Ivan Savenko
0b22ed7607 Merge pull request #3387 from dydzio0614/instant-animations
New setting to skip adventure map fadein/fadeout
2023-12-24 19:21:56 +02:00
Dydzio
70aed9490d Change wording to less technical 2023-12-24 17:49:58 +01:00
Dydzio
046d3abee4 Add new setting for instant adventure map fade in / fadeout effects 2023-12-24 17:18:48 +01:00
Ivan Savenko
172e385f67 Merge pull request #3375 from Laserlicht/round_counter
turn indicator
2023-12-24 16:25:04 +02:00
Ivan Savenko
85d930bbd0 Merge pull request #3374 from dydzio0614/default-large-spellbook
Default large spellbook
2023-12-24 16:23:29 +02:00
Ivan Savenko
7958faaa2c Merge pull request #3339 from IvanSavenko/changelog_142
[1.4.2] Changelog
2023-12-24 14:13:30 +02:00
Ivan Savenko
75cd9ca12b Added 1.4.2 changelog 2023-12-24 14:13:09 +02:00
Ivan Savenko
e77651d3f3 Merge pull request #3377 from dydzio0614/commander-skills-fix
Commander skills fix
2023-12-24 13:33:48 +02:00
Ivan Savenko
2b495a9679 Merge pull request #3379 from IvanSavenko/fix_genie_spellcasting
Fix genie spellcasting
2023-12-24 13:29:05 +02:00