1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Commit Graph

157 Commits

Author SHA1 Message Date
Laserlicht
ed562e42ba battleonly gui 2025-10-24 00:56:20 +02:00
Laserlicht
9cfe9e931c resizable battle window 2025-10-03 03:41:59 +02:00
Laserlicht
5057609078 fix glitch with small queue 2025-07-11 20:24:47 +02:00
Ivan Savenko
cdf7230da6 Tweaks for adaptive battle window UI
Now quick spell/actions windows have a priority over info windows (timer
/ hero / unit) if there is not enough space for both.

This means that:
- quick actions window can now be enabled if screen is at least 900px-
wide (and not 1050px)
- info windows now account for quick action window presence. If quick
actions window is active, info windows will be placed inside battle
window if screen is below 1050px wide

This makes it possible to use quick actions window in most resolutions,
for example - in 16x10 screens with maxed out resolution scaling.

No changes in actual window layout.
2025-07-06 18:20:34 +03:00
Laserlicht
2189b8a8b6 fix timer and background 2025-07-06 01:17:33 +02:00
Laserlicht
eecc3ce632 gap-less layout 2025-07-06 00:52:57 +02:00
Laserlicht
4aad60523c fine tuning turn timers 2025-07-04 21:42:16 +02:00
Laserlicht
e0ea7ca32b remove border in battle 2025-07-04 20:22:01 +02:00
Ivan Savenko
1ac8080cbf Implemented new unit actions panel in combat
Alternative actions submod from extras is now deprecated and will have
no effect.

As long as screen width allows, game will now display additional panel
with all possible unit actions.

Panel will also display spells that can be cast by unit, allowing small
version of unit spellbook (total limit of actions is 12, but some are
used for creature actions, so unit spells are limited to 7-9)
2025-06-19 19:29:01 +03:00
Ivan Savenko
14a3f5a004 Remove custom flag from Quick spell panel 2025-06-19 12:19:24 +03:00
Ivan Savenko
ae93cbde91 Fix clang-tidy warnings 2025-06-18 17:38:26 +03:00
Ivan Savenko
298ec472bf Split BattleInterfaceClasses into smaller files 2025-06-18 17:29:20 +03:00
Dydzio
4721cff8be Allow "finish battle with autocombat" during tactics phase 2025-05-20 20:40:06 +02:00
Ivan Savenko
2c17c2d5b7 Rework CCallback <-> CClient interaction
- callback is now part of lib instead of weird class that is shared by
client and AI while being part of client
- callback interacts with client class via minimal interface class
- removed no longer used unlockGsWhileWaiting field
2025-05-12 22:07:10 +03:00
Ivan Savenko
35644da2b7 Reogranize callback-related classes on 1 file = 1 class basis 2025-05-12 22:07:09 +03:00
Ivan Savenko
f70ad2c15b Reorganized artifact-related classes
- files now generally contain only 1 class (except for tightly coupled
classes)
- files are now located in lib/entities/artifact directory
- removed excessive includes

No changes to functionality
2025-04-29 13:29:08 +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
Ivan Savenko
cef7466c71 Merge pull request #4643 from SoundSSGood/CArtHandler-refactoring
CArtifactSet  tidy up
2024-10-01 16:26:32 +03:00
SoundSSGood
586a32a616 CArtifactSet cleanup 2024-09-23 23:39:19 +03:00
Dydzio
dc56047661 Add hex highlight for SPELL_LIKE_ATTACK in casting mode & minor cleanup 2024-09-22 20:38:49 +02:00
Ivan Savenko
9fba3d97f1 Renamed & unified OBJECT_CONSTRUCTION macro set 2024-08-09 15:30:04 +00:00
Ivan Savenko
3f9e57d3f3 Merge pull request #4334 from Laserlicht/quickspell_improve
quickspell improvements
2024-08-07 13:08:13 +03:00
K
70f3397a35 fix crash when my city without hero is attacked 2024-08-04 16:49:53 +02:00
Laserlicht
e46f5f705b better approach 2024-07-26 20:34:47 +02:00
Laserlicht
136f33f950 quickspell improvements 2024-07-26 20:11:14 +02:00
Laserlicht
2d100b00cd check spellbook 2024-07-26 01:06:54 +02: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
Laserlicht
9ac7db24ca Merge branch 'develop' into quickspell 2024-07-18 21:24:42 +02:00
Laserlicht
e629b7a371 reduce to 12 with gap 2024-07-17 19:26:18 +02:00
Laserlicht
4415f645a7 lambda -> function; fix color 2024-07-17 18:07:45 +02:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Laserlicht
f0435d8b8e small fix 2024-07-17 13:48:00 +02:00
Laserlicht
5562402646 hotkey number from config 2024-07-17 12:37:23 +02:00
Laserlicht
b8d872aa60 mobile adjustments 2024-07-17 04:24:27 +02:00
Laserlicht
0a98169bcf update quick spell panel 2024-07-17 00:55:01 +02:00
Laserlicht
a3874297f5 toggle window 2024-07-17 00:48:22 +02:00
Laserlicht
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
Laserlicht
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
Dydzio
3836f132d3 Fix alternative actions to support more than 2 actions + simplify logic 2024-07-15 00:41:05 +02:00
Laserlicht
11664b27b8 fix for develop 2024-06-21 22:34:14 +02:00
Laserlicht
13ebd026cc remove unnecassary conditions 2024-06-21 21:29:19 +02:00
Laserlicht
53a1bf2051 add spell cast 2024-06-21 21:29:19 +02:00
Laserlicht
e4dfca9f3d disable correctly 2024-06-21 21:26:10 +02:00
Laserlicht
989394de53 Selectionwindow 2024-06-21 21:25:14 +02:00
Laserlicht
814241e836 converted to window 2024-06-21 21:25:14 +02:00