1
0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-18 09:41:19 +02:00

37 Commits

Author SHA1 Message Date
Laserlicht a3800ac8ae Merge remote-tracking branch 'origin/develop' into demo 2026-04-19 15:36:41 +02:00
Laserlicht 9d8f0a8cef fix exchange; artfiacts; online lobby for demo 2026-04-04 14:39:34 +02:00
Boris Nagaev 38bfd1c7e5 Fix broken relative local include paths
Many quoted local includes had an incorrect ../ depth and resolved to
non-existent files from the including file's directory.

This was easy to miss because normal target include directories and PCH
usage masked some failures, and several stale paths lived in files that
are only compiled in optional test configurations. As a result, the
problem mostly surfaced in stricter or broader fresh builds.

Audit all C++ and header local includes, keep them relative, and adjust
paths so each include resolves to an existing in-tree header. For
headers that were renamed or moved, update includes to their current
relative location instead of switching to include-root form.

A few legacy ERM tests also used dynamic_ptr_cast at call sites where we
had to replace stale headers. The helper/header path they relied on is
no longer present after 81af66d35b, so
those downcasts are now explicit dynamic_cast calls with the same intent.
2026-03-26 20:14:59 -05:00
SoundSSGood 04ed758c41 assembling art qol 2025-08-10 17:21:44 +02:00
Ivan Savenko bd88ae18aa Merge pull request #5844 from IvanSavenko/bonus_fixes
Fixes to bonus system functionality
2025-06-30 11:58:42 +03:00
Ivan Savenko 099053437a Update unit growth in town screen UI when unequipping Legion pieces 2025-06-25 11:50:33 +03:00
Laserlicht 59c05cd1a3 move buttons 1 pixel left 2025-06-23 01:11:20 +02:00
Laserlicht 4f970fcaa6 fine tune quick exchange positions 2025-06-22 20:21:01 +02:00
Laserlicht d003030d08 add text 2025-06-20 14:08:07 +02:00
Laserlicht 596e99d774 fix two 2025-06-20 13:51:52 +02:00
Laserlicht 87792dfc88 fix exchange window 2025-06-20 13:47:59 +02:00
Ivan Savenko 35644da2b7 Reogranize callback-related classes on 1 file = 1 class basis 2025-05-12 22:07:09 +03:00
Ivan Savenko 63d00b080e Removed pointer to army from StackInstance 2025-04-27 14:57:30 +03: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
Dydzio 567c88a924 Hero exchange: Q button swaps army + artifacts instead of opening quests 2025-02-15 18:50:14 +01:00
Dydzio a6ab76d3ec Add ctrl+click and shift+click behavior for creatures "arrows" - hero exchange 2025-02-15 18:49:12 +01:00
Dydzio ceac0bc203 Full exchange when holding alt while pressing exchange screen creature arrow button 2024-12-03 20:40:06 +01:00
SoundSSGood fa9201831b QuickBackpack window position on shift+click slot fixed 2024-11-04 14:16:06 +02:00
SoundSSGood f60813d86f CHeroOverview secondary skill icons fixed 2024-11-03 17:29:27 +02:00
Ivan Savenko f12119f86c Merge pull request #4812 from SoundSSGood/secSkillPlace
[Hota] SeafaringAcademy. Initial PR
2024-10-30 13:33:39 +02:00
Ivan Savenko d1164ab9a9 Integrated exchange window translation into vcmi 2024-10-26 13:09:09 +00:00
SoundSSGood 83279211e6 CSecSkillPlace done 2024-10-23 15:01:56 +03:00
Ivan Savenko 10ad0fc760 Split CHeroHandler.cpp/.h into 1 file per class
All parts of CHeroHandler.cpp are now in lib/entities/hero
Adjusted includes to use new paths
No functionality changes
2024-10-13 14:01:09 +00:00
Ivan Savenko 3dd4fa2528 Reduce usage of pointers to VLC entities
Final goal (of multiple PR's) is to remove all remaining pointers from
serializeable game state, and replace them with either identifiers or
with shared/unique pointers.

CGTownInstance::town and CGHeroInstance::type members have been removed.
Now this data is computed dynamically using subID member.

VLC entity of a town can now be accessed via following methods:
- getFactionID() returns ID of a faction
- getFaction() returns pointer to a faction
- getTown() returns pointer to a town

VLC entity of a hero can now be accessed via following methods:
- getHeroTypeID() returns ID of a hero
- getHeroClassID() returns ID of a hero class
- getHeroType() returns pointer to a hero
- getHeroClass() returns pointer to a hero class
2024-10-10 12:28:08 +00:00
Ivan Savenko 9fba3d97f1 Renamed & unified OBJECT_CONSTRUCTION macro set 2024-08-09 15:30:04 +00:00
Ivan Savenko 1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
Ivan Savenko a1fb3b8b01 Reduce direct access to CAnimation, removed various caching schemes 2024-07-19 10:08:50 +00:00
Ivan Savenko b4c6906471 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-11 19:22:23 +00:00
SoundSSGood a7239a6fcc fix 2024-06-05 09:52:16 +03:00
Ivan Savenko 6b336b454e Less ambiguous names for buttons in exchange window. Fixes swapped
button functions.
2024-06-01 07:39:43 +00:00
Ivan Savenko df83fa33a1 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-31 09:34:21 +00:00
Ivan Savenko 5feef488e3 Added Ctrl & Shift versions for swap artifacts shortcut. Exchange window
shortcuts now work even without vcmi extras
2024-05-19 12:28:03 +00:00
Ivan Savenko d965226cbd Moved Exchange Window to new file, no functionality changes 2024-05-19 10:53:56 +00:00