Ivan Savenko
|
d6ab285752
|
Merge pull request #3466 from LokiLaufeyjarson1712/develop
Fixed Reverse-Assignment of Dungeon Hero Classes
|
2024-01-09 12:10:11 +02:00 |
|
Loki Laufeyjarson
|
0ac844e958
|
Fixed Reverse-Assignment of Dungeon Hero Classes
For example making a custom dungeon here and giving him warlock made him an overlord and vice versa
|
2024-01-09 02:21:14 +01:00 |
|
Ivan Savenko
|
bdf223956d
|
Merge pull request #3465 from kdmcser/develop
update Chinese translation
|
2024-01-08 17:12:19 +02:00 |
|
kdmcser
|
beb849ee3d
|
update Chinese translation
|
2024-01-08 22:20:37 +08:00 |
|
Ivan Savenko
|
ae79c5e953
|
Merge pull request #3397 from Laserlicht/cheat_allow
option for disabling cheats
|
2024-01-07 21:42:02 +02:00 |
|
Ivan Savenko
|
d934a21388
|
Merge pull request #3441 from heroesiiifan/patch-5
Extended Translations.md
|
2024-01-06 13:05:46 +02:00 |
|
heroesiiifan
|
992900728f
|
Update Translations.md
|
2024-01-05 22:02:14 +00:00 |
|
Ivan Savenko
|
9a9141afed
|
Merge pull request #3431 from Alexander-Wilms/gcc-13-ci
CI: Build linux-gcc-test preset with gcc 13
|
2024-01-05 13:49:28 +02:00 |
|
Ivan Savenko
|
396c6658df
|
Merge pull request #3421 from Kuxe/windows_mingw_cmake_preset
Add 'windows-mingw-release' CMake preset
|
2024-01-05 00:09:28 +02: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
|
27cbf48b40
|
Merge pull request #3418 from macomarivas/develop
Android launcher Spanish translation
|
2024-01-03 12:31:41 +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 |
|
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 |
|
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
|
2023-12-24 23:53:50 +02:00 |
|