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

14607 Commits

Author SHA1 Message Date
Dydzio
7283a4861e Initial version of ACCURATE_SHOT implementation 2024-01-04 22:27:51 +01:00
Alexander Wilms
5e96c90996 CI: Build linux-gcc-test preset with gcc 13
This helps detecting issues with newer gcc versions, like #2866

Fixes #3407
2024-01-04 19:48:16 +00:00
Joakim Thorén
491dfd8502 Remove platform related checks for setting 'CMAKE_C(XX)_COMPILER_LAUNCHER' as 'ccache'. 2024-01-04 16:00:00 +01:00
Joakim Thorén
c8ed138145 Use statically linked Qt5 for Windows MinGW builds. This solves an issue where OpenSSL dlls had to be manually copied into binary dir for VCMI_launcher to be able to download mods. 2024-01-03 23:58:37 +01:00
Ivan Savenko
121ef77440
Merge pull request #3416 from Laserlicht/video_campaign_fix
video position for campaigns
2024-01-03 12:32:40 +02:00
Ivan Savenko
5d38cca6ed
Merge pull request #3415 from Laserlicht/spellbook_pages
spellbook fix pages
2024-01-03 12:32:00 +02:00
Ivan Savenko
27cbf48b40
Merge pull request #3418 from macomarivas/develop
Android launcher Spanish translation
2024-01-03 12:31:41 +02:00
Ivan Savenko
fd3d0598c5
Merge pull request #3419 from vcmi/dydzio0614-patch-1
Fix wrong comment in commander levelup config
2024-01-03 12:30:40 +02:00
Ivan Savenko
2fc6797466
Merge pull request #3422 from Kuxe/enable_colorized_compiler_output
Add 'ENABLE_COLORIZED_COMPILER_OUTPUT' CMake option for Clang/GNU
2024-01-03 12:29:49 +02:00
Ivan Savenko
daf527ab52
Merge pull request #3424 from Kuxe/ignore_compile_commands
Ignore compile_commands.json
2024-01-03 12:29:37 +02:00
Joakim Thorén
a78a3b3e4f Added documentation on how to build using windows-mingw-release preset 2024-01-02 22:24:41 +01:00
Joakim Thorén
5f27359fce Ignore compile_commands.json 2024-01-02 21:57:27 +01:00
Joakim Thorén
50698db1c0 Merge branch 'enable_colorized_compiler_output' of https://github.com/Kuxe/vcmi into enable_colorized_compiler_output 2024-01-02 21:33:52 +01:00
Joakim Thorén
4f4298ece8 Change default of ENABLE_COLORIZED_COMPILER_OUTPUT from off to on 2024-01-02 21:33:49 +01:00
Andrii Danylchenko
d1553c448a
Merge pull request #3408 from vcmi/battle-ai-fix
Battle ai fix
2024-01-02 21:13:43 +02:00
Andrii Danylchenko
1a1ae5cd8b BattleAI: fixes 2024-01-02 17:35:10 +02:00
Joakim Thorén
f7896b20bf
Update CMakeLists.txt
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2024-01-02 11:14:27 +01:00
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