43 Commits

Author	SHA1	Message	Date
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
krs	7eda4b6c1e	replaced SDLK_LSHIFT check with GH.isKeyboardShiftDown()	2023-04-08 20:42:37 +03:00
krs	3194999809	Add SHIFT + hover shortcut to show movement highlight while pressed.	2023-04-08 20:42:37 +03:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Ivan Savenko	a3c5f75600	Fix visibility of alternative actions button in tactics stage	2023-04-05 18:36:10 +03:00
Ivan Savenko	cf966015bb	Correctly update battle queue state after changing its state	2023-04-05 18:35:45 +03:00
Ivan Savenko	238de8a5d7	Properly disable combat panel during spell targeting	2023-03-28 18:14:09 +03:00
Ivan Savenko	dc099b2a35	Implemented support for multi-spell casters	2023-03-25 00:48:14 +02:00
Ivan Savenko	4968ac58b4	Do not abort battle opening sound, only allow actions	2023-03-21 13:49:19 +02:00
Ivan Savenko	2864a04bda	Minor refactoring	2023-03-20 20:19:05 +02:00
Ivan Savenko	688b8db3eb	Removed delays due to thread waits from battle animations	2023-03-20 20:19:05 +02:00
Ivan Savenko	7030fa8fe7	Allow changing queue size instantly on option toggle	2023-03-05 19:55:38 +02:00
Dydzio	6bd4eac27a	Rename settings files	2023-02-18 17:58:22 +01:00
Dydzio	9101f05835	Fixes for new battle settings	2023-02-15 22:38:41 +01:00
Dydzio	7430616ada	Move settings to separate subfolder	2023-02-12 17:29:23 +01:00
Dydzio	34227a0dab	Integrate new settings with battle UI	2023-02-12 15:49:17 +01:00
Dydzio	fc7d2b9778	Merge remote-tracking branch 'origin/develop' into settings-rework	2023-02-12 11:55:21 +01:00
Ivan Savenko	4a0a82ceb4	Merge pull request #1553 from IvanSavenko/sdl_cleanup ... SDL usage cleanup	2023-02-08 18:14:15 +02:00
nordsoft	fd6987ea0a	Fix alternative actions button redraw	2023-02-05 03:29:50 +04:00
Ivan Savenko	7c58a46279	Removed some instances of access to screen surface	2023-02-03 18:23:53 +02:00
Ivan Savenko	3fef2a5e1f	Moved Colors to a separate file, updated includes	2023-02-03 11:39:40 +02:00
Ivan Savenko	cfcaf5cbb6	renamed keyDown -> keyPressed	2023-02-03 11:39:40 +02:00
Ivan Savenko	d4fba3787c	Removed usage of SDL_KeyboardEvent from UI code	2023-02-03 11:39:40 +02:00
Ivan Savenko	64faa13b6d	Merge pull request #1487 from IvanSavenko/battle_actions_refactoring ... Battle actions refactoring	2023-02-03 11:28:14 +02:00
Dydzio	2ef33d54ab	Merge branch 'develop' into battle-queue-improvement	2023-02-02 18:26:31 +01:00
Dydzio	5a08ec04fe	Initial split of BattleOptionsWindow	2023-02-02 17:17:16 +01:00
Ivan Savenko	a2035122e1	Removed makingTurn variable	2023-02-02 13:25:55 +02:00
Dydzio	d04c53e7e0	Merge branch 'develop' into settings-rework	2023-02-02 11:55:13 +01:00
Ivan Savenko	108a42e4ba	Reorganized includes for new layout. New class - IImageLoader	2023-02-01 20:42:06 +02:00
Dydzio	cc9d65a341	Make battle settings callable without battle, save last settings tab	2023-01-30 22:15:37 +01:00
Ivan Savenko	9c3030603d	Removed most SDL includes from headers, removed SDL int's	2023-01-30 19:55:32 +02:00
Dydzio	92754e22f0	Highlight stack on queue icon hovered	2023-01-22 20:03:11 +01:00
Ivan Savenko	388ed88b5d	All artifact strings now pass through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	fa6f7513e8	All heroes-related strings are passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	0e8ee929df	Renamed CCursorHandler -> CursorHandler	2023-01-15 21:18:34 +02:00
Ivan Savenko	f155a35378	Fix positioning of UI elements in BattleWindow	2023-01-09 17:25:49 +02:00
Ivan Savenko	7657115c5a	Fix battleQueue positioning on toggling hotkey	2023-01-04 16:40:38 +02:00
Ivan Savenko	d3ecd43aba	Merge remote-tracking branch 'vcmi/develop' into battle_improvements	2023-01-04 16:20:53 +02:00
Ivan Savenko	4bfdb44c78	Restore status bar on BattleWindow reactivation	2022-12-30 12:32:36 +02:00
Ivan Savenko	5d80457eda	Merge with vcmi/develop branch	2022-12-30 00:52:23 +02:00
Ivan Savenko	d0f259bbf7	Fix battle shutdown	2022-12-21 18:04:19 +02:00
Ivan Savenko	541d98143b	Renamed BattleControlPanel -> BattleWindow	2022-12-21 17:06:47 +02:00