1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00

38 Commits

Author SHA1 Message Date
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
9ac7db24ca Merge branch 'develop' into quickspell 2024-07-18 21:24:42 +02:00
4415f645a7 lambda -> function; fix color 2024-07-17 18:07:45 +02:00
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
3836f132d3 Fix alternative actions to support more than 2 actions + simplify logic 2024-07-15 00:41:05 +02:00
989394de53 Selectionwindow 2024-06-21 21:25:14 +02:00
1f6e0fae7d quickspell draft 2024-06-21 21:25:14 +02:00
2aec3cde2c Fix possible crash on replaying combat after manual run 2024-05-23 12:46:28 +00:00
0db8266495 Implemented some of the requested shortcuts 2024-05-19 09:12:36 +00:00
5d8b65befd Merge pull request #3575 from Laserlicht/infobox_pos
fix infobox position while disabling
2024-01-30 17:36:30 +02:00
36881c226f fix infobox position while disabling 2024-01-27 22:08:15 +01:00
3e71cbcc39 Block feature is battle against human 2024-01-27 14:35:54 +01:00
e8c541f873 end with auto combat 2024-01-26 23:15:56 +01:00
a9005da01e Merge pull request #3366 from Laserlicht/battle_informations
Battle stacks informations
2023-12-28 12:39:26 +02:00
56e1265097 use stacks 2023-12-22 22:26:35 +01:00
72911ec9a3 Army window 2023-12-22 21:26:40 +01:00
f834cb3d99 Display different timers separately when applicable 2023-12-22 18:40:28 +02:00
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
47b6358e6e Improve feature by triggering hero window refresh in response to netpack 2023-07-22 21:51:14 +02:00
05735a20e1 Fix for hero info window mana points not getting spent on spellcast 2023-07-22 15:32:00 +02:00
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +02:00
4e242f98fd Battleintro: Skip with mouse button 2023-07-15 21:18:04 +02:00
1cec6918a0 Fix spellcast cancelation in battle 2023-06-05 19:20:06 +03:00
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
ecff5f3d12 Do not trigger multiple hotkeys when battle window wait for any key 2023-05-09 13:10:33 +03:00
832e56e005 Implementation of (very basic) shortcuts system
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
2023-05-01 17:58:17 +03:00
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
krs
3194999809 Add SHIFT + hover shortcut to show movement highlight while pressed. 2023-04-08 20:42:37 +03:00
dc099b2a35 Implemented support for multi-spell casters 2023-03-25 00:48:14 +02:00
7030fa8fe7 Allow changing queue size instantly on option toggle 2023-03-05 19:55:38 +02:00
9101f05835 Fixes for new battle settings 2023-02-15 22:38:41 +01:00
cfcaf5cbb6 renamed keyDown -> keyPressed 2023-02-03 11:39:40 +02:00
d4fba3787c Removed usage of SDL_KeyboardEvent from UI code 2023-02-03 11:39:40 +02:00
92754e22f0 Highlight stack on queue icon hovered 2023-01-22 20:03:11 +01:00
d3ecd43aba Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2023-01-04 16:20:53 +02:00
d0f259bbf7 Fix battle shutdown 2022-12-21 18:04:19 +02:00
541d98143b Renamed BattleControlPanel -> BattleWindow 2022-12-21 17:06:47 +02:00