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

340 Commits

Author SHA1 Message Date
Ivan Savenko
dd823d1681 Merge pull request #5560 from GeorgeK1ng/campaigns
[1.7] Campaigns configurations improvements
2025-04-02 13:54:50 +03:00
George King
1edd666ac1 Page identification when needed 2025-03-21 22:12:15 +01:00
George King
551c1021b9 Remove not needed variables 2025-03-21 17:16:25 +01:00
George King
1996c77d49 Update client/mainmenu/CCampaignScreen.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-21 17:14:55 +01:00
George King
11c32c7a8c Update client/mainmenu/CCampaignScreen.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2025-03-21 17:14:24 +01:00
George King
b237ed7b7a Add files via upload 2025-03-21 14:20:36 +01:00
George King
1123d944fc Make new buttons moddable 2025-03-21 14:17:08 +01:00
George King
4a0d8a2015 Merge pull request #1 from vcmi/develop
Update branch
2025-03-19 09:45:29 +01:00
Ivan Savenko
7a3e1409d0 Remove old boost includes and defines 2025-03-19 08:03:56 +00:00
George King
02bae5ef21 Removed non needed part of code 2025-03-17 22:08:08 +01:00
George King
2e352dc233 Minimize changes 2025-03-17 22:01:08 +01:00
George King
784b5ba09e Minimize changes 2025-03-17 21:59:10 +01:00
George King
537a112a65 Minimize changes 2025-03-17 21:54:43 +01:00
George King
08c42b156f Cleanup, fix for non existant campaign files 2025-03-17 21:47:25 +01:00
George King
453240fd4d Remove unneeded headers 2025-03-17 20:54:09 +01:00
George King
a6ba2f97e0 Add files via upload 2025-03-17 20:21:22 +01:00
George King
af5f68128c Support for huge campaigns sets with pages in menu 2025-03-17 20:17:09 +01:00
Ivan Savenko
6ed1aad11b Merge pull request #5545 from Laserlicht/video_skip_harominize
optimize skip video keys
2025-03-16 19:08:57 +02:00
Laserlicht
46cd1f7805 optimize skip video keys 2025-03-13 20:56:09 +01:00
Ivan Savenko
9732d39c70 Moved shutdown request dialog handling to GameInstance 2025-03-12 13:33:12 +00:00
Ivan Savenko
f7305fd1c2 Merge pull request #5540 from GeorgeK1ng/campaign_sets
Make campaign sets modable
2025-03-12 14:56:10 +02:00
George King
3d7f6922ad Allow campaing sets to be modded 2025-03-11 20:04:31 +01:00
Laserlicht
7af340e301 setting to disable subtitle 2025-03-10 00:04:44 +01:00
George King
391a119c90 Merge branch 'develop' into main_menu_1.7 2025-03-07 17:25:53 +01:00
George King
3a6e76022c Switched to images 2025-03-07 17:16:17 +01:00
George King
ac57e1ee7f Code cleanup 2025-03-07 14:11:43 +01:00
George King
067e4655aa Added 1.6 fallback + code cleanup 2025-03-03 17:38:54 +01: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
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
8f074490a7 Merge branch 'master' into 'develop' 2025-02-27 21:15:42 +00:00
Laserlicht
845f985a13 snap in marker if mouse near data point 2025-02-22 14:55:16 +01:00
Laserlicht
3e942395cf correctly center icons 2025-02-22 12:45:41 +01:00
Laserlicht
f8cebe81bf remove weird line when winning in the first round 2025-02-22 12:19:31 +01:00
Ivan Savenko
645b95ba02 Renamed LibClasses * VLC to GameLibrary * LIBRARY 2025-02-21 16:54:56 +00:00
Ivan Savenko
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
Ivan Savenko
ffd37a8fa8 Removed CGI in favor of VLC. Map handle is for now global variable 2025-02-21 16:53:14 +00:00
Ivan Savenko
f657e85305 Integrated CClientState into GameEngine class 2025-02-21 16:53:14 +00:00
Ivan Savenko
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
Laserlicht
de06de06b5 refactor backgrounds (allow resolution change) 2025-02-08 20:53:32 +01:00
Ivan Savenko
ec5d4dbe5d Merge pull request #5361 from GeorgeK1ng/menu_campaign_fix
Fix VCMP campaign detection for buttons
2025-02-02 14:10:12 +02:00
George King
fc87e903fe Fix VCMP campaign detection for buttons 2025-02-01 09:59:01 +01:00
George King
5b579f6912 Fix VCMP campaign detection for buttons 2025-02-01 09:57:11 +01:00
George King
26eac7d82b Improved Main menu
1) Added option to use custom logo and sublogo on Main menu, Scenario selection and Loading screen
2) Added option to use custom loading bar frame on Loading screen
2025-01-31 14:20:10 +01:00
Ivan Savenko
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
Ivan Savenko
2ee5f2df02 Merge pull request #5295 from IvanSavenko/bugfixing
[1.6.4] Bugfixing for recently reported issues
2025-01-21 15:50:02 +02:00
Ivan Savenko
4912e92f33 Try to fix possible crash on statistics window 2025-01-19 12:40:17 +00:00
George King
8d9c28685c MuMap FallBack + campaign buttons displaying validation 2025-01-12 11:35:06 +01:00
George King
f3d48ecc3a Ability to use random progress bar 2025-01-08 00:16:55 +01:00
George King
905eac24ae Multiplayer menu improvements 2025-01-07 19:30:26 +01:00