1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Commit Graph

19427 Commits

Author SHA1 Message Date
Ivan Savenko
3d205e0291 Remove CThreadHelper class, final usage replaced with tbb 2025-03-02 14:33:11 +00:00
Ivan Savenko
0536c55b9d Merge pull request #5494 from IvanSavenko/cpp_compat
Fix potential compatibility with C++20 / C++23 mode
2025-03-02 16:32:43 +02:00
Ivan Savenko
a8a6be7ac1 Fix potential compatibility with C++20 / C++23 mode
This fixes several issues with compatibility with C++20. C++23 was also
tested, but apparently it does not have any additional breaking changes
compared to C++20 (or we don't have those).

VCMI still uses C++17 as before - goal is only to make potential
transition easier.

There were 2 cases that are deprecated in C++20 that we use:
- Floating point operations on enums are deprecated
- `this` can no longer be captured when using default capture by value
`[=]`

Both of those should now be replaced with code that works fine in both C+
+17 and in C++20 mode
2025-03-02 14:11:48 +00:00
Ivan Savenko
f348e20a63 Merge pull request #5487 from IvanSavenko/game_engine_2
Reduce number of global variables
2025-03-02 12:43:16 +02:00
Ivan Savenko
272943f38a Merge pull request #5491 from IvanSavenko/threading
Use tbb thread pool instead of custom one for RMG
2025-03-02 12:42:54 +02:00
Ivan Savenko
06be6b909c Fix build, reduce includes of CConsoleHandler 2025-03-01 21:16:41 +00:00
Ivan Savenko
dd1b877449 Replace several more globals with locals 2025-03-01 21:16:41 +00:00
Ivan Savenko
782362e5ce Remove console global 2025-03-01 21:16:41 +00:00
Ivan Savenko
e5a095a237 Remove main menu global. Now accessed via GameInstance 2025-03-01 21:16:41 +00:00
Ivan Savenko
d3de0d525f Removed GameEngine::curInt member
- event processing is now initiated by GameEngine instead of weird chain
engine -> player interface -> engine
- introduced GameEngineUser interface (implemented by GameInstance) to
remove mutual depedency between GameEngine and GameInstance (some
technically still remains for now, in form of some free functions)
2025-03-01 21:16:40 +00:00
Ivan Savenko
a4587c0e65 Add basic docs on vcmi threads 2025-03-01 21:16:03 +00:00
Ivan Savenko
33468f21ff Remove custom implementation of threadpool from rmg in favor of TBB 2025-03-01 21:16:03 +00:00
Ivan Savenko
f06e707108 Merge pull request #5488 from Laserlicht/boost
replace some boost functions with std
2025-03-01 23:15:01 +02:00
Ivan Savenko
b0de99fe89 Merge pull request #5478 from heroesiiifan/translation
develop - add greek, japanese, norwegian; harmonize
2025-03-01 23:14:28 +02:00
Ivan Savenko
0d4d004516 Merge pull request #5489 from IvanSavenko/changelog_february
Initial changelog for 1.7.0
2025-03-01 23:13:51 +02:00
Ivan Savenko
924c1cb3f5 Initial changelog for 1.7.0 2025-02-28 16:31:20 +00:00
Laserlicht
0182bcd74a Revert "min_element and max_element from std"
This reverts commit ba2d8dc276.
2025-02-28 17:04:37 +01:00
Laserlicht
a8b9ec9d67 Revert "std::sort instead of boost::sort"
This reverts commit 2f8566b63e.
2025-02-28 17:04:06 +01:00
Laserlicht
b977a4bbfe Revert "boost::system_error"
This reverts commit 41a4ea1163.
2025-02-28 17:03:20 +01:00
Ivan Savenko
1097a80c1e Merge pull request #5414 from IvanSavenko/bonus_icons
[1.7] Configurable icons for bonuses
2025-02-28 17:58:02 +02:00
Laserlicht
ba2d8dc276 min_element and max_element from std 2025-02-28 16:56:20 +01:00
Laserlicht
2f8566b63e std::sort instead of boost::sort 2025-02-28 16:47:35 +01:00
Laserlicht
38b537dcaf remove boost header 2025-02-28 16:29:44 +01:00
Laserlicht
4e73f7d90f shared_mutex replace boost 2025-02-28 16:01:11 +01:00
Ivan Savenko
a3dbb5748c Fix build 2025-02-28 14:59:00 +00:00
Ivan Savenko
35fc7f7f03 Use new URL for 1.7 mods 2025-02-28 14:51:33 +00:00
Ivan Savenko
07a46ed03b Configurable icons for bonuses
It is now possible for mods (e.g. vcmi extras) to provide custom icons
for bonuses subtypes or for custom bonuses values without requiring
hardcoded check in vcmi.

All existing hardcoded checks have been removed.

Bonuses config json from mods is now actually loaded.
2025-02-28 14:51:32 +00:00
Laserlicht
41a4ea1163 boost::system_error 2025-02-28 15:38:36 +01:00
Laserlicht
75a95d8513 boost::lock_guard replace 2025-02-28 15:28:38 +01:00
Laserlicht
7dfb499edf replace boost locks with std 2025-02-28 15:25:58 +01:00
Laserlicht
3fb9260f3b replace boost::recursive_mutex with std 2025-02-28 14:08:32 +01:00
Ivan Savenko
8f074490a7 Merge branch 'master' into 'develop' 2025-02-27 21:15:42 +00:00
Ivan Savenko
dfda6d2626 Merge pull request #5484 from vcmi/beta
Merge beta -> master
1.6.7
2025-02-27 16:08:20 +02:00
Ivan Savenko
a8d8b64882 Merge pull request #5483 from IvanSavenko/release_167
Preparation for release 1.6.7
2025-02-27 15:11:14 +02:00
Ivan Savenko
da0943db99 Download counter for 1.6.7 2025-02-27 10:15:23 +00:00
Ivan Savenko
cad6ea5402 Update Ukrainian translation 2025-02-27 10:15:23 +00:00
Ivan Savenko
f04cac4101 Fix format string 2025-02-27 10:15:23 +00:00
Ivan Savenko
c60954932d Fix build on newest MSVC 2025-02-27 10:15:23 +00:00
Ivan Savenko
0e4a4ae5aa Merge pull request #5482 from IvanSavenko/changelog_167
Changelog for 1.6.7
2025-02-27 12:14:34 +02:00
Ivan Savenko
5a59789371 Changelog for 1.6.7 2025-02-27 09:50:40 +00:00
Ivan Savenko
398c0e318c Merge pull request #5480 from GeorgeK1ng/czech-update
[1.6.7] Czech update + English formatting
2025-02-27 11:39:12 +02:00
Ivan Savenko
5a5ec55dac Merge pull request #5481 from IvanSavenko/ai_crash_fix
[1.6.7] Invalidate pathfinder cache on dismissing a hero
2025-02-27 11:36:53 +02:00
heroesiiifan
d6467f26d7 make new languages selectable only with config file 2025-02-26 17:14:06 +01:00
Ivan Savenko
a075ac1ad1 Merge pull request #5468 from Laserlicht/lobby_aspect_ratio
[1.6.7] make lobby 4:3 aspect ratio & fixes
2025-02-26 17:20:53 +02:00
Ivan Savenko
f4f89d1536 Invalidate pathfinder cache on dismissing a hero 2025-02-26 14:47:00 +00:00
George King
6e1e944fa2 Encoding fix 2025-02-26 11:50:50 +01:00
George King
5efebd1e7d Updated Czech + fixed formatting in English 2025-02-26 11:48:56 +01:00
heroesiiifan
16471251dc add missing translation files 2025-02-26 01:10:58 +01:00
heroesiiifan
68b3421d5d add greek, japanese, norwegian; harmonize 2025-02-25 22:54:19 +01:00
Laserlicht
ac5988a643 Lobby: 4:3 and wide layout 2025-02-25 21:25:01 +01:00