Dydzio
|
319d05b94f
|
Missing merge conflict stuff
|
2023-02-12 12:05:12 +01:00 |
|
Dydzio
|
11df79dc2a
|
Minor formatting
|
2023-02-12 11:55:39 +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 |
|
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
|
62151cd20c
|
Replaced genRect with Rect constructor call
|
2023-02-03 19:17:59 +02: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
|
9833edcf73
|
Removed using namespace SDL_Ext
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
d87fb43dcd
|
Replaced SDL access with VCMI methods
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
3fef2a5e1f
|
Moved Colors to a separate file, updated includes
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
aab082fd2e
|
Remove remaining access to SDL_Events
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
594b7614cf
|
Fix CI build
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
cfcaf5cbb6
|
renamed keyDown -> keyPressed
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
b1821d4442
|
Removed some SDL access from non-SDL code
|
2023-02-03 11:39:40 +02:00 |
|
Ivan Savenko
|
e1bd0d2a04
|
API for custom events no longer requires SDL access
|
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
|
860fe43131
|
Merged two mouse button enums
|
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
|
58cfddccaa
|
Merge pull request #1546 from rilian-la-te/dead-code-removal
Remove SDL usage from VCMI library
|
2023-02-03 11:28:29 +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 |
|
Konstantin
|
88ef83db53
|
client: remove SDL_BYTEORDER usage
Make use of CMake endian checking in this places too.
|
2023-02-03 00:37:37 +03: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
|
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 |
|
Dydzio
|
d04c53e7e0
|
Merge branch 'develop' into settings-rework
|
2023-02-02 11:55:13 +01:00 |
|
Ivan Savenko
|
34772ef830
|
Fixed includes
|
2023-02-01 21:45:06 +02:00 |
|
Ivan Savenko
|
108a42e4ba
|
Reorganized includes for new layout. New class - IImageLoader
|
2023-02-01 20:42:06 +02:00 |
|
Ivan Savenko
|
84dfcacafd
|
Updated CMakeLists and file headers
|
2023-02-01 16:42:03 +02:00 |
|
Ivan Savenko
|
4d8d886317
|
Move all created files into better locations
|
2023-02-01 16:28:48 +02:00 |
|
Ivan Savenko
|
ae968d1865
|
Remove duplicated code from new files
|
2023-02-01 16:12:01 +02:00 |
|
Ivan Savenko
|
5cc0de2fc6
|
Finish CAnimation split
|
2023-02-01 16:04:14 +02:00 |
|
Ivan Savenko
|
f6fa7f1ae0
|
temp rename
|
2023-02-01 16:03:48 +02:00 |
|
Ivan Savenko
|
54a95efc4d
|
split CFadeAnimation into separate file
|
2023-02-01 16:03:17 +02:00 |
|
Ivan Savenko
|
3a88e7ce07
|
split CDefFile into separate file
|
2023-02-01 16:02:33 +02:00 |
|
Ivan Savenko
|
eef5876069
|
split SDLImageLoader into separate file
|
2023-02-01 16:01:47 +02:00 |
|
Ivan Savenko
|
d593b88713
|
split SDLImage into separate file
|
2023-02-01 16:00:32 +02:00 |
|