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

836 Commits

Author SHA1 Message Date
7af340e301 setting to disable subtitle 2025-03-10 00:04:44 +01:00
a061ed04de Remove usage of ConstTransitivePtr from CTown 2025-03-08 14:04:51 +00: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
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
e4a719fb7e Fix corrupted pixels on town building animations in mods 2025-02-25 15:28:45 +00:00
eeef7efac5 fix stuck (press) slider w. clicking on empty area 2025-02-23 20:54:31 +01: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
05e8542a79 Fix corrupted image of university 2025-02-20 13:09:38 +00:00
7d9c9d19c4 Merge pull request #5432 from Laserlicht/fixes
[1.6.6] multiple fixes
2025-02-17 12:36:47 +02:00
a6ab76d3ec Add ctrl+click and shift+click behavior for creatures "arrows" - hero exchange 2025-02-15 18:49:12 +01:00
e9dc9f81b8 text fixes 2025-02-15 16:46:41 +01:00
bdc15cfdc5 fix scroll issue (#5076) 2025-02-15 15:44:41 +01:00
9effde04bb Merge pull request #5404 from Laserlicht/upgrade_all
[1.6.6] extend radial wheel in town to upgrade all creatures
2025-02-15 11:12:37 +02:00
0bbcb21826 optimize radial wheel if only few button exisiting 2025-02-09 21:54:31 +01:00
367aa94227 Do not scroll lists in lobby if another item is hovered 2025-02-06 14:20:45 +00:00
38bb5a76e6 Handle flag color overlay and creature selection overlay separately
Fixes handling of Iron Golem animation from HotA
2025-02-03 11:44:21 +00:00
cca4c0888c In-memory assets generation
All assets generation (large spellbook, terrain animations, etc) are now
done in memory and used as it, without saving to disk.

This should slightly improve load times since there is no encode png /
decode png, and should help with avoiding strange bug when vcmi fails to
load recently saved assets.

If needed, such assets can be force-dumped on disk using already
existing console command
2025-01-30 22:21:38 +00:00
668bf63fc0 Remove access to internal surface of Canvas 2025-01-21 21:15:21 +00:00
4a600a9d4c Reworked image container classes for easier support of new features 2025-01-21 21:15:21 +00:00
f893c80192 Move UpgradeInfo class to header and source files 2024-12-19 14:13:09 +01:00
af9445c16f Fixes following review 2024-12-17 22:34:06 +01:00
d8d3948ac3 Fix AI to use hillFort all available upgrades. UpgradeInfo refactor. 2024-12-17 22:34:06 +01:00
a29f455625 fix video crash with subtitles 2024-12-11 21:31:00 +01:00
9fbeacb688 Fix possible memory corruption in video player
Fixes two bugs, one was definitely happening, and 2nd one that is causing
undefined behavior and may work only in some std implementations

- VideoPlayer would attempt to access subtitles widget after VideoPlayer
itself was destroyed in onPlaybackFinished call
- std::function was destroyed from a function that is being called by
it. Replaced with 1-method interface to avoid usage of std::function in
this scenario
2024-12-07 15:37:03 +00:00
e87ed1e80c Add extra clientside sanity check (should be there from thestart) 2024-12-03 21:03:25 +01:00
877f47e37f Merge branch 'develop' into video 2024-12-02 13:48:30 +02:00
e6cd3630e0 fix warning 2024-11-30 17:20:39 +01:00
543185a530 prescale support for video 2024-11-29 23:33:28 +01:00
c3494b4a73 Merge pull request #4982 from kdmcser/fix_dismiss_crash
crash fix: dismiss hero when pick artifact
2024-11-27 16:41:44 +02:00
993a4dc73d crash fix: dismiss hero when pick artifact 2024-11-26 01:11:09 +08:00
b89db3f044 fix popup 2024-11-21 23:12:27 +01:00
91940dbfc6 Do not show selection highlight on creature preview images 2024-11-17 20:40:38 +00:00
251155d913 More robust management of body/shadow/overlay split 2024-11-17 17:54:55 +00:00
c82db9d574 Fix crash on rearranging troops on non-owned hero 2024-11-17 17:38:54 +00:00
df0c53af41 Merge pull request #4864 from Laserlicht/creature_window_rework
Creature window rework
2024-11-15 19:13:58 +02:00
27b59dd7ee crash fixed 2024-11-13 06:39:37 +02:00
da8fe13632 Merge pull request #4870 from SoundSSGood/secSkillPlace-fix
CHeroOverview secondary skill icons fixed
2024-11-06 22:02:28 +02:00
e7bea6c3b8 Merge pull request #4852 from IvanSavenko/remove_vlc_entities_serialization
Remove remaining pointers to VLC entities from serializer
2024-11-06 22:01:11 +02:00
11d9ee310e Merge pull request #4785 from Laserlicht/subtitles
Subtitles for videos / sync
2024-11-06 21:56:43 +02:00
f60813d86f CHeroOverview secondary skill icons fixed 2024-11-03 17:29:27 +02:00
0ab4b66026 better approach for scrollbar 2024-11-02 15:16:38 +01:00
0969871835 Merge branch 'develop' into mechanical_bonus 2024-10-31 15:14:51 +02:00
d3af9f1c67 Removed pointer to VLC entity from CStackBasicDescriptor 2024-10-30 16:47:02 +00:00
c98ac01e7a Replaced public artType member of ArtifactInstance with getter 2024-10-30 16:47:01 +00:00
f12119f86c Merge pull request #4812 from SoundSSGood/secSkillPlace
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00