1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Commit Graph

38 Commits

Author SHA1 Message Date
Ivan Savenko
da79b27547 Merge pull request #6164 from Laserlicht/resbar
Resourcebar in adventuremap
2025-10-04 15:01:56 +03:00
Laserlicht
fc00774277 fix button condition 2025-10-02 21:55:52 +02:00
Laserlicht
d921a5c528 make sonar happy 2025-09-28 22:20:00 +02:00
Laserlicht
e4cd9895be make sonar happy 2025-09-28 22:16:21 +02:00
Laserlicht
08116b13de remove todo 2025-09-28 21:57:58 +02:00
Laserlicht
5fbca18e8f Merge branch 'resbar' into merg 2025-09-28 21:11:51 +02:00
Ivan Savenko
c469c6c31e Merge pull request #6136 from Laserlicht/resource
Configurable resources
2025-09-28 21:51:10 +03:00
Ivan Savenko
adab720592 Merge pull request #6156 from Laserlicht/butgen
adventure map config button generation
2025-09-28 18:47:20 +03:00
Laserlicht
69bc16370d add icon 2025-09-21 22:47:21 +02:00
Laserlicht
6c6350ad8b code review 2025-09-21 22:07:57 +02:00
Laserlicht
40405113c6 draw multiple 2025-09-21 19:54:25 +02:00
Laserlicht
a833b53432 resbar 2025-09-21 19:35:23 +02:00
Laserlicht
a4b09f8310 correctly register them 2025-09-19 14:48:17 +02:00
Laserlicht
6320fd8ab0 generate button from icon in config (big & small) 2025-09-19 14:35:11 +02:00
Laserlicht
8f392fcc82 remove RESOURCE_QUANTITY usages 2025-09-16 02:08:17 +02:00
Laserlicht
d808bd6412 introduce toResourceType 2025-09-15 00:08:18 +02:00
Laserlicht
f034584dfa replace RESOURCE_QUANTITY where possible 2025-09-14 21:12:51 +02:00
Laserlicht
a54a1f8b8d replace RESOURCE_NAMES where possible 2025-09-14 20:43:53 +02:00
Laserlicht
d58d963874 shortcut market + boat 2025-09-09 01:00:38 +02:00
Laserlicht
182100dfd1 button for more than 2 layers 2025-08-17 16:16:18 +02:00
Laserlicht
ecfe09f6b1 multilevel support 2025-08-01 02:21:44 +02: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
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
Ivan Savenko
915533ed2e Implemented generation of player-colored version of DiBoxBck 2024-09-12 21:22:41 +00:00
Ivan Savenko
9fba3d97f1 Renamed & unified OBJECT_CONSTRUCTION macro set 2024-08-09 15:30:04 +00:00
Ivan Savenko
0e407540ec Fixed player-coloring on adventure map 2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b Unified naming of method to recolor UI element to current player scheme 2024-07-19 10:08:50 +00:00
Ivan Savenko
a1fb3b8b01 Reduce direct access to CAnimation, removed various caching schemes 2024-07-19 10:08:50 +00:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2 convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00
Ivan Savenko
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
0f88b8969b Removed some usages of std string as resource path 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
Ivan Savenko
c171a3d6be Fix resource bar UI in hotseat 2023-08-24 23:34:33 +03:00
Ivan Savenko
8ea0ecaec1 show/showAll methods now use Canvas instead of SDL_Surface
- added compatibility method to Canvas to allow SDL_Surface access
- added drawBorder method to Canvas to replace CSDL_Ext method
- added drawColor method to Canvas to replace CSDL_Ext method
- minor changes to Tavern and Trade windows to adapt to new API
2023-06-02 16:42:18 +03:00
Ivan Savenko
c01b74434c Fix cancelling spellcast with escape 2023-05-09 13:10:33 +03:00
Ivan Savenko
243773b6ef Renamed some adventure map files & classes 2023-05-09 13:10:33 +03:00