1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

14298 Commits

Author SHA1 Message Date
Andrii Danylchenko
e46f442a20
Merge pull request #2838 from Alexander-Wilms/ci-using-encrypted-data
Enable unit tests for Linux CI builds
2024-01-13 12:26:28 +02:00
Ivan Savenko
29eab0fdbe
Merge pull request #3476 from kdmcser/develop
Add Chinese translate for mapeditor
2024-01-12 21:54:22 +02:00
Ivan Savenko
019a4151b9
Merge pull request #3258 from SoundSSGood/trade-panels
Market rework
2024-01-12 21:53:13 +02:00
kdmcser
1d4862fc83 add Chinese translate for mapeditor 2024-01-12 23:12:54 +08:00
kdmcser
765425a785 fix wrong translate string in Chinese 2024-01-12 23:12:19 +08:00
SoundSSGood
4df7de36c1 fixed regression 2024-01-11 14:51:42 +02:00
SoundSSGood
b840cf3650 suggested changes 2024-01-11 12:46:32 +02:00
Ivan Savenko
fb027d1a57
Merge pull request #3469 from Alexander-Wilms/define-each-identifier-in-a-dedicated-statement
Define each identifier in a dedicated statement
2024-01-11 11:22:36 +02:00
Ivan Savenko
952520a8e7
Merge pull request #3463 from ToRRent1812/patch-1
Update to Polish translation
2024-01-10 15:47:37 +02:00
Ivan Savenko
2d8129e684
Merge pull request #3472 from macomarivas/develop
Updated Spanish translation an folder fix
2024-01-10 15:39:14 +02:00
Asirome
53b8e557a2
Updated Spanish translation 2024-01-10 12:55:38 +01:00
Asirome
d489701756
Android launcher Spanish folder fix 2024-01-10 11:31:29 +01:00
Alexander Wilms
781328f282 Convert C-style casts to the more verbose C++ style 2024-01-10 00:30:35 +00:00
Alexander Wilms
5e9f98b15c Resolve intentionality issues 2024-01-10 00:23:24 +00:00
Alexander Wilms
f3277b7953 Define each identifier in a dedicated statement 2024-01-10 00:22:23 +00:00
SoundSSGood
fdf60b2151 moved to widgets/markets 2024-01-09 20:21:09 +02:00
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
Alexander Wilms
f78fe102ac H3 data for unit tests: Use encrypted zip
This is easier than splitting H3bitmap and encrypting each file separately
2024-01-08 19:28:11 +00:00
Alexander Wilms
8800b361fd Disable broken tests so the working ones don't rot 2024-01-08 19:13:44 +00:00
Alexander Wilms
b1020bdd5b Enable unit tests for Linux CI builds 2024-01-08 19:13:44 +00:00
Ivan Savenko
bdf223956d
Merge pull request #3465 from kdmcser/develop
update Chinese translation
2024-01-08 17:12:19 +02:00
SoundSSGood
d0ca63d2c9 subclasses for market composition 2024-01-08 16:24:47 +02:00
SoundSSGood
50a5c72d1b Creatures trade panel 2024-01-08 16:24:47 +02:00
SoundSSGood
791ee78cc4 players trade panel 2024-01-08 16:24:47 +02:00
SoundSSGood
f043c417a1 Artifacts trade panel 2024-01-08 16:24:47 +02:00
SoundSSGood
b246e24811 reworking slot selection 2024-01-08 16:24:47 +02:00
SoundSSGood
6c828d1be9 Resources trade panel 2024-01-08 16:24:47 +02:00
kdmcser
beb849ee3d update Chinese translation 2024-01-08 22:20:37 +08:00
Łukasz Zając
709a349a23
Update polish.json 2024-01-08 00:48:04 +01: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