1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00

Merge branch 'vcmi/master' into 'vcmi/develop'

This commit is contained in:
Ivan Savenko
2024-05-31 09:34:21 +00:00
166 changed files with 2893 additions and 1363 deletions

View File

@@ -14,6 +14,7 @@
class CMultiLineLabel;
class VideoWidget;
class CFilledTexture;
class CPrologEpilogVideo : public CWindowObject
{
@@ -27,6 +28,7 @@ class CPrologEpilogVideo : public CWindowObject
std::shared_ptr<CMultiLineLabel> text;
std::shared_ptr<VideoWidget> videoPlayer;
std::shared_ptr<CFilledTexture> backgroundAroundMenu;
bool voiceStopped = false;