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

1428 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
e5a095a237 Remove main menu global. Now accessed via GameInstance 2025-03-01 21:16:41 +00: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
8f074490a7 Merge branch 'master' into 'develop' 2025-02-27 21:15:42 +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
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
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
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
58042c5cd6 Remove default focus from spellbook search, allow toggling focus via shortcut 2025-02-15 18:50:43 +01:00
567c88a924 Hero exchange: Q button swaps army + artifacts instead of opening quests 2025-02-15 18:50:14 +01: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
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
3e161da834 code review 2025-02-14 21:03:23 +01:00
b69e1ce1fb Merge pull request #5399 from Laserlicht/combat_health
[1.6.6] Combat Health Bar & Calculation fix
2025-02-14 13:09:49 +02:00
c6987f4183 upgrade all radial wheel button 2025-02-09 21:54:30 +01:00
68e0dcb01d Merge pull request #5398 from Laserlicht/portrait_mode
[1.6.6] portrait mode for android & grey bar fix
2025-02-09 19:42:03 +02:00
640f654fe0 Merge pull request #5401 from Laserlicht/touch_overlay
[1.6.6] overlay for touch screens & pinch fix
2025-02-09 19:40:45 +02:00
c13edc8af3 Merge pull request #5383 from IvanSavenko/bugfixing
[1.6.6] Fixes for issues in 1.6.5
2025-02-09 19:27:43 +02:00
1f61f22122 implement overlay for touch screens 2025-02-09 13:10:27 +01:00
d98ce78c34 add setting for hp bar 2025-02-08 22:48:21 +01:00
de06de06b5 refactor backgrounds (allow resolution change) 2025-02-08 20:53:32 +01:00
52d72c75fc Buttons with text tooltip for artifact sorting screen 2025-02-08 16:31:37 +00:00
f4a218285f Fix display of remaining spell duration for creatures 2025-02-06 14:19:34 +00:00
d72b743ce5 Merge pull request #5350 from MichalZr6/fix_miniHillFort
Fix creating buttons in Stack Window when upgrade is unavailable
2025-02-04 01:02:50 +02:00
b36f5e4026 Merge branch 'beta' into 'develop' 2025-02-03 16:29:10 +00:00
cf44186a11 Fix crash on accepting turn in MP with settings window open 2025-02-01 12:23:22 +00:00
386679294f Fix crash on stack being affected by spell with battle-wide propagator 2025-02-01 12:23:22 +00:00
d3131ea365 Merge branch 'beta' into 'develop' 2025-01-31 16:33:12 +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
358189d9c3 Fix creating buttons for unavailable upgrades 2025-01-30 16:00:22 +01:00
d54d498d5f Don't play new building sound twice on auto-built buildings 2025-01-26 15:50:26 +00:00
722d68643f Merge pull request #5306 from IvanSavenko/xbrz_foreground
[1.6.4?] Move xbrz upscaling from foreground thread to background
2025-01-25 17:23:46 +02:00
9a1c2a5800 Merge pull request #5317 from Laserlicht/search_inp
[1.6.4] improved text search
2025-01-25 13:54:27 +02:00
0035b2346a optimized search input 2025-01-23 23:50:04 +01:00
3c104d0e4b max width 2025-01-23 22:12:40 +01:00
38d3426a3b thieves guild icons instead of text 2025-01-23 21:47:49 +01: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