1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

9777 Commits

Author SHA1 Message Date
Konstantin
30784477e0 CMakeLists.txt: strip on package if no debuginfo is requested
It significantly reduces size of the executable
2023-01-26 23:50:08 +03:00
Konstantin
d62d5a83ab CMakeLists.txt: fix compilation with latest TBB on 22.04
It has a config file only for None build type. Map this as fallback
for all build types.
2023-01-26 23:50:08 +03:00
Konstantin
bd0c7c2b54 vcmi: add before_install.sh
For now, it uses pregenerated deps from my repository, but
should be transitioned to vcmi one after PR is finished
2023-01-26 23:50:08 +03:00
Konstantin
57b93e00ca github/workflows: add conan-win32 workflow
This will not work for now, but added for future proof
2023-01-26 23:49:54 +03:00
Konstantin
a24ec53df2 vcmi: enable Conan builds for cross-compiling Win
This patch enables usage of Conan for cross-compiling Windows
builds instead of MXE.
2023-01-26 23:49:00 +03:00
Konstantin
f0cb8b63c7 lib/CGameInterface.cpp: add MinGW workaround
MinGW returns all dynamic library functions as FARPROC, which need
to be cast to actual signatures, and this casts emits
-Wcast-function-type.
So, silence it for GetProcAddress.
2023-01-26 23:49:00 +03:00
Konstantin
cf56f7ccce vcmi: remove unused-but-set-variables 2023-01-26 23:49:00 +03:00
Konstantin
3ea4e8c249 AI/CMakeLists.txt: disable some errors for FuzzyLite
It generates false positives on MinGW due to Fuzzylite errorneous
assuming than Windows=MSVC.
2023-01-26 23:49:00 +03:00
Ivan Savenko
da124b2c78 Converted ChangeLog to use Markdown syntax 2023-01-26 19:58:54 +02:00
DjWarmonger
25ef065dbe
Merge pull request #1486 from IvanSavenko/configurable_rewardables
Well, it works for my brand new objects with arbitrary bonus, so likely will work with everything else.
2023-01-26 17:01:01 +01:00
Andrey Filipenkov
612b5e2746 attempt to show shipyard dialog only when a hero is selected
fixes regression from a4e8255cbc
2023-01-25 20:49:37 +03:00
Andrey Filipenkov
7e78e0abdc
Merge pull request #1493 from kambala-decapitator/ios-spacebar
[iOS] use pinch gesture as Spacebar hotkey instead of Tab
2023-01-25 18:32:40 +03:00
Andrey Filipenkov
a2ac189e03 fix typo 2023-01-25 18:13:11 +03:00
Andrey Filipenkov
0bbf70f30a show resurrect message in the battle log 2023-01-25 18:13:06 +03:00
Andrey Filipenkov
54537fc02c
Merge pull request #1478 from kambala-decapitator/units-huge-numbers
limit displayed units number to 4 digits
2023-01-25 17:47:08 +03:00
Andrey Filipenkov
785d565f31
Merge pull request #1483 from kambala-decapitator/statue-of-legion-bonus
fix displaying growth bonus from Statue of Legion
2023-01-25 17:45:30 +03:00
Andrey Filipenkov
b2d2c7a2dc
Merge pull request #1501 from kambala-decapitator/townportal-doubleclick
handle double-click in Town Portal dialog
2023-01-25 17:42:15 +03:00
Andrey Filipenkov
18c52f05ca
Merge pull request #1506 from kambala-decapitator/cmake-zip-ipa
generate ipa file with CPack directly
2023-01-25 17:41:10 +03:00
Konstantin
a7bd7232ce CGuiHandler: fix false positive dangling pointer
Making this an auto variable fixes compilation with Werror.
2023-01-25 17:14:41 +03:00
Ivan Savenko
bd45d88a1b
Merge pull request #1459 from IvanSavenko/mod_translations
Translation support for mods
2023-01-25 14:05:05 +02:00
Ivan Savenko
4a8d1d9b5e Serialization version bump 2023-01-25 12:36:03 +02:00
Ivan Savenko
19cfb79c59 Removed H3 language detection - should be set by Launcher 2023-01-25 12:36:03 +02:00
Ivan Savenko
17b510703e Added german, polish, and ukrainian translations 2023-01-25 12:36:03 +02:00
Ivan Savenko
35775b90f8 Moved bonus names to translation 2023-01-25 12:36:02 +02:00
Ivan Savenko
39131eba3e Added translation support for mods. VCMI translations are now in mod.
Moved existing (English) translation to vcmi mod
Added translations for:
- German
- Polish
- Ukrainian
2023-01-25 12:33:54 +02:00
Ivan Savenko
52ab0f9b5b
Merge pull request #1446 from dydzio0614/movement-points-show
Implement movement points info on ALT hold + tile mouse hover
2023-01-25 12:30:34 +02:00
Ivan Savenko
078a4c9de7
Merge pull request #1492 from dydzio0614/missing-bonus-entry
Add missing entries for new "limited shooting range" bonus
2023-01-25 12:30:25 +02:00
Konstantin
f93c9277c6 lib/filesystem: rename CreateFile to createFile
In MinGW, there is a define which replaces all CreateFile to
CreateFileA or CreateFileW and breaks compilation. Fix it.
2023-01-25 12:13:34 +03:00
Andrii Danylchenko
0595381acf
Merge pull request #1507 from vcmi/update-jni
Somehow it works but JNI signatures were incorrect
2023-01-25 10:42:21 +02:00
Andrii Danylchenko
1a7ec728d9
Merge pull request #1484 from kambala-decapitator/shipyard-fixes
Shipyard dialog fixes
2023-01-25 10:42:04 +02:00
Andrii Danylchenko
3cef3c10be
Merge pull request #1489 from dydzio0614/console-crash-fix
Improve handling of empty text in console, remove unused includes
2023-01-25 10:40:47 +02:00
Andrii Danylchenko
94f483c1e7
Merge pull request #1481 from kambala-decapitator/owner-tooltip
display owner of ownable objects in tooltip
2023-01-25 10:38:13 +02:00
Andrii Danylchenko
4cfc93d2da Somehow it works but JNI signatures were incorrect 2023-01-25 08:59:59 +02:00
Ivan Savenko
0215939491
Merge pull request #1497 from Adriankhl/fix_ffmpeg
Fix ffmpeg include paths
2023-01-25 01:13:39 +02:00
Ivan Savenko
7a9e5e4e30 Cleanup & consistency changes 2023-01-25 00:38:50 +02:00
Ivan Savenko
af5ff0c9df Remove no longer used code 2023-01-24 23:34:02 +02:00
Ivan Savenko
44bdd2cbf3 Implemented selectable messages for visited & empty state 2023-01-24 23:31:07 +02:00
Andrey Filipenkov
035851bb38 add max version condition to Xcode workaround 2023-01-24 20:18:09 +03:00
Andrey Filipenkov
9addc83a6b generate ipa file with CPack directly 2023-01-24 20:10:57 +03:00
Andrey Filipenkov
90cb0cdc9b fix displaying growth bonus from Statue of Legion 2023-01-24 18:35:30 +03:00
Andrey Filipenkov
5b10903116 reorder growth bonuses display to match oh3 2023-01-24 18:35:07 +03:00
Ivan Savenko
ca6947b2cc Fixed Tree of Knowledge component 2023-01-24 17:35:06 +02:00
Ivan Savenko
3ba8d708f8 Partially fixed bonuses descriptions (affected by separate old bug) 2023-01-24 17:34:48 +02:00
Ivan Savenko
c793527b44 Added "days since start of the game" limiter. Fixes Water Wheel 2023-01-24 16:54:14 +02:00
Ivan Savenko
ca521fb129 Removed incomplete functionality from rewardable object 2023-01-24 16:29:05 +02:00
Ivan Savenko
c9dcb921ab Implemented "changeCreatures" option for Stables 2023-01-24 16:18:59 +02:00
Ivan Savenko
ecbcafefbc It is now possible to configure what exactly will be reset in object 2023-01-24 13:54:03 +02:00
DjWarmonger
c6c2bc7ca4
Merge pull request #1504 from vcmi/dydzio0614-patch-1
Change readme year to 2023
2023-01-24 10:52:58 +01:00
Ivan Savenko
0c70822928 Implemented logical expression (allOf/anyOf/noneOf) for limiters 2023-01-23 23:54:54 +02:00
Dydzio
84f2977501
Change readme year to 2023 2023-01-23 16:05:40 +01:00