1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00
Commit Graph

7086 Commits

Author SHA1 Message Date
3f4267df15 fix crash, when no cost for upgrade 2025-03-08 12:46:00 +01:00
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
06be6b909c Fix build, reduce includes of CConsoleHandler 2025-03-01 21:16:41 +00:00
e5a095a237 Remove main menu global. Now accessed via GameInstance 2025-03-01 21:16:41 +00:00
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
f06e707108 Merge pull request #5488 from Laserlicht/boost
replace some boost functions with std
2025-03-01 23:15:01 +02:00
0182bcd74a Revert "min_element and max_element from std"
This reverts commit ba2d8dc276.
2025-02-28 17:04:37 +01:00
a8b9ec9d67 Revert "std::sort instead of boost::sort"
This reverts commit 2f8566b63e.
2025-02-28 17:04:06 +01:00
ba2d8dc276 min_element and max_element from std 2025-02-28 16:56:20 +01:00
2f8566b63e std::sort instead of boost::sort 2025-02-28 16:47:35 +01:00
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
7dfb499edf replace boost locks with std 2025-02-28 15:25:58 +01:00
8f074490a7 Merge branch 'master' into 'develop' 2025-02-27 21:15:42 +00:00
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
ac5988a643 Lobby: 4:3 and wide layout 2025-02-25 21:25:01 +01:00
1e020a3b56 Merge pull request #5476 from IvanSavenko/hotfix
[1.6.7] Fixes for reported issues
2025-02-25 19:38:16 +02:00
5a813feaa6 Merge pull request #5475 from IvanSavenko/lobby_fix_2
[1.6.7] Better fix for lobby room crash
2025-02-25 18:56:50 +02:00
420f358599 Avoid crash on having unsupported campaigns in map list 2025-02-25 15:29:09 +00:00
e4a719fb7e Fix corrupted pixels on town building animations in mods 2025-02-25 15:28:45 +00:00
e2e83b392b Merge pull request #5467 from IvanSavenko/brotherhood_fix
[1.6.7] Fix Brotherhood displaying Thieves Guild UI on click instead of Tavern
2025-02-25 16:50:18 +02:00
b304788722 Merge pull request #5464 from Laserlicht/statistic_fixes
[1.6.7?] Statistic window fixes
2025-02-25 16:50:09 +02:00
d772521d59 Merge pull request #5460 from Laserlicht/setting
[1.6.7?] Add settings
2025-02-25 16:49:48 +02:00
42878af3a6 Better fix for lobby room crash
Always use TCP connection when connecting to self-hosted lobby room.
Effectively reverts 1.6.6 change for lobby connections. Single-player
connections still use intra-process pseudo connection

Main problem is various side effects caused by changing order of
operations. For example, client may inform lobby about joining the room
before server finishes startup, which was not possible before.
2025-02-25 14:05:56 +00:00
eeef7efac5 fix stuck (press) slider w. clicking on empty area 2025-02-23 20:54:31 +01:00
bf77dd8a7f fix incorrect help for lobby send message button 2025-02-23 20:15:23 +01:00
a334b7f3a6 fix graphical glitch when scrolling 2025-02-23 18:58:37 +01:00
b6dd4460de Fix Brotherhood displaying Thieves Guild UI on click instead of Tavern 2025-02-23 14:46:04 +00:00
52f7caa0e4 use settings instead of persistentStorage 2025-02-22 20:34:13 +01:00
bc90f4f4aa Merge pull request #5461 from Laserlicht/touch_improve
[1.6.7?] Improve touch motion
2025-02-22 20:58:28 +02:00
1bc7c13204 Possible fix for crash on attempt to free sdl surface in worked thread 2025-02-22 17:16:18 +00:00
a6a6b8c69c save only adventure map zoom 2025-02-22 16:08:54 +01:00
222fe3c0b1 improve 2025-02-22 15:07:38 +01:00
845f985a13 snap in marker if mouse near data point 2025-02-22 14:55:16 +01:00
3e942395cf correctly center icons 2025-02-22 12:45:41 +01:00
f8cebe81bf remove weird line when winning in the first round 2025-02-22 12:19:31 +01:00
802bed69d5 allow more precise touch movements 2025-02-22 00:47:55 +01:00
7beabc44ea save mapzoom 2025-02-21 23:01:47 +01:00
3627731041 (config only) setting to disable async upscaling 2025-02-21 21:59:00 +01:00
db23cc2ffa add setting for disabling overlay 2025-02-21 21:35:17 +01:00
cbcd48aabb Fix build 2025-02-21 18:51:27 +00:00
645b95ba02 Renamed LibClasses * VLC to GameLibrary * LIBRARY 2025-02-21 16:54:56 +00:00
156de5b17e Added GameInstance class
- available as global GAME
- integrates LOCPLINT (CPlayerInterface)
- integrates CGI->mh (CMapHandler)
- integrates CSH (CServerHandler)
2025-02-21 16:54:06 +00:00
ffd37a8fa8 Removed CGI in favor of VLC. Map handle is for now global variable 2025-02-21 16:53:14 +00:00
f657e85305 Integrated CClientState into GameEngine class 2025-02-21 16:53:14 +00:00
cacceda950 Renamed CGuiHandler to GameEngine
- class CGuiHandler is now called GameEngine to better describe its
functionality
- renamed global GH to more clear ENGINE
- GH/ENGINE is now unique_ptr to make construction / deconstruction
order more clear and to allow interface / implementation split
- CGuiHandler.cpp/h is now called GameEngine.cpp/h and located in root
directory of client dir
2025-02-21 16:53:13 +00:00
2362c6da21 Fixes for multiple new issues from Sonar 2025-02-21 15:57:39 +00:00
0548f325e4 Merge branch 'master' into 'develop' 2025-02-21 13:59:34 +00:00
b2642bb7d7 Merge pull request #5422 from IvanSavenko/disposed_heroes_fix
[1.7] Do not allow heroes banned for player as starting heroes
2025-02-20 16:33:04 +02:00
9c6be97445 Merge pull request #5411 from IvanSavenko/hw_accel_prep
[1.7] SDL access cleanup and encapsulation
2025-02-20 16:32:39 +02:00
ca8ae56965 Merge pull request #5454 from IvanSavenko/university_fix
Fix corrupted image of university
2025-02-20 15:43:58 +02:00