1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

523 Commits

Author SHA1 Message Date
Ivan Savenko
4a0a82ceb4
Merge pull request #1553 from IvanSavenko/sdl_cleanup
SDL usage cleanup
2023-02-08 18:14:15 +02:00
Ivan Savenko
ab8b407294 Style cleanup 2023-02-08 13:56:09 +02:00
nordsoft
fd6987ea0a Fix alternative actions button redraw 2023-02-05 03:29:50 +04:00
Ivan Savenko
34dcb4127a Removed text utilities from SDL_Extensions 2023-02-03 18:55:25 +02:00
Ivan Savenko
7c58a46279 Removed some instances of access to screen surface 2023-02-03 18:23:53 +02:00
Ivan Savenko
ae9f040abf removed unused method 2023-02-03 11:42:27 +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
6669ffd4b3 Moved input-related code from SDL_Extensions to GuiHandler 2023-02-03 11:39:40 +02:00
Ivan Savenko
214fc19e74 CIntObject now receives mouse position as point instead of SDL event 2023-02-03 11:39:39 +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
Ivan Savenko
2ac997d8a9 Fix "holding" animation speed 2023-02-02 14:37:34 +02:00
Ivan Savenko
731f7b0578 Fix opening spellbook via clicking on hero 2023-02-02 14:37:16 +02:00
Ivan Savenko
1e09c39c0e Fix battle cursor after attack command 2023-02-02 14:36:58 +02:00
Ivan Savenko
3c8a0b9e70 Add missing text 2023-02-02 13:43:20 +02:00
Ivan Savenko
9678296875 Hero interaction is now battle action 2023-02-02 13:43:19 +02:00
Ivan Savenko
d3c85a19cb Merged CClickableHex class into BattleFieldController 2023-02-02 13:35:57 +02:00
Ivan Savenko
c3b79c786b Spellcasters UI now shares handling with hero spellcasting 2023-02-02 13:25:55 +02:00
Ivan Savenko
f150ced14c All spellcasters should work correctly now 2023-02-02 13:25:55 +02:00
Ivan Savenko
55a58596bc Mostly finished refactoring of BattleActionsController
TODO: test actions
TODO: test casters
TODO: fix random casters
2023-02-02 13:25:55 +02:00
Ivan Savenko
a2035122e1 Removed makingTurn variable 2023-02-02 13:25:55 +02:00
Ivan Savenko
4d62bf22f2 Removed no longer used code 2023-02-02 13:25:55 +02:00
Ivan Savenko
108a42e4ba Reorganized includes for new layout. New class - IImageLoader 2023-02-01 20:42:06 +02:00
Ivan Savenko
0ba74fea73
Merge pull request #1515 from IvanSavenko/time_based_animations
Time based animations
2023-02-01 12:25:54 +02:00
Ivan Savenko
bf343126c4 Fix Hero animation speed in battles 2023-01-31 00:42:50 +02:00
Ivan Savenko
9c3030603d Removed most SDL includes from headers, removed SDL int's 2023-01-30 19:55:32 +02:00
Ivan Savenko
e14290fde0 Removed loading of images from file into SDL_Surface 2023-01-30 18:25:47 +02:00
Ivan Savenko
42df5626d9 Added Color class to replace SDL_Color 2023-01-30 00:12:43 +02:00
Andrey Filipenkov
07dc2e1c48
Merge pull request #1496 from kambala-decapitator/resurrect-message
show resurrect message in the battle log
2023-01-29 22:18:32 +03:00
Ivan Savenko
3749074a4d Renamed speed setting name to force-reset it to new scale 2023-01-28 16:49:35 +02:00
Ivan Savenko
9d1a075806 Fix battle speed selector in settings 2023-01-28 14:00:49 +02:00
Ivan Savenko
d34efaeb81 All battle effects now use time-based timings 2023-01-28 13:19:35 +02:00
Ivan Savenko
4d1c338503
Merge pull request #1498 from rilian-la-te/conan-v2
Conan as MXE replacement
2023-01-27 23:14:37 +02:00
Konstantin
cf56f7ccce vcmi: remove unused-but-set-variables 2023-01-26 23:49:00 +03:00
Andrey Filipenkov
a2ac189e03 fix typo 2023-01-25 18:13:11 +03:00
Dydzio
68be7643f1 Remove redundant method - code review suggestion 2023-01-25 13:06:13 +01:00
Dydzio
4a23f93754 Give thicker frame to highlighted queue boxes 2023-01-23 12:32:20 +01:00
Dydzio
aa18118df0 Add simple cyan color frame on highlight + mouse right-click for mobile 2023-01-23 11:34:21 +01:00
Dydzio
bd1bd5064a Highlight logic for queue icon on stack hover, lacks visual representation 2023-01-22 20:06:10 +01:00
Dydzio
92754e22f0 Highlight stack on queue icon hovered 2023-01-22 20:03:11 +01:00
Andrey Filipenkov
6f0cd37e8f limit displayed units number to 4 digits in battle
- unit box
- turn queue
2023-01-20 20:38:54 +03:00
Ivan Savenko
8ed115a628 Fix ios compile 2023-01-20 16:11:43 +02:00
Ivan Savenko
9be38780cd Removed remaining parts of Geomeotries.h/cpp 2023-01-20 16:11:43 +02:00
Ivan Savenko
46931a0ecf Bugfixing 2023-01-20 16:11:43 +02:00
Ivan Savenko
ee7a573cb8 Refactoring of SDL API usage:
- Rect no longer inherits from SDL_Rect
- renamed vcmi functions that used SDL naming format
- moved all functions in SDL_Extensions file into CSDL_Ext namespace
- SDL_Rect is now used only by SDL_Extensions, all other code uses Rect
2023-01-20 16:11:43 +02:00
Ivan Savenko
05a1d7c6e3 All text for factions/towns/building are passed through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
388ed88b5d All artifact strings now pass through translator 2023-01-20 15:18:36 +02:00
Ivan Savenko
d2b837b116 All creature-related texts go through translator 2023-01-20 15:18:36 +02:00