Ivan Savenko
8c52cbcd00
Merge pull request #1429 from dydzio0614/creature-numeric-quantities
...
Implement numeric creature descriptions with config toggle on/off
2023-02-26 22:57:01 +02:00
Ivan Savenko
195eac3375
Merge pull request #1545 from dydzio0614/town-panel-number-formatting
...
Improve creature numbers handling in castle interface bottom left part
2023-02-26 22:56:54 +02:00
Ivan Savenko
cc84bed0c0
Merge pull request #1540 from dydzio0614/settings-rework
...
Settings rework
2023-02-26 22:56:35 +02:00
Andrey Filipenkov
f128404770
simplify creating client target
2023-02-22 14:00:53 +03:00
Dydzio
9eccc29e16
Adjust tab positioning
2023-02-19 12:18:54 +01:00
Dydzio
7f03223634
Remove SDL_Events reference
2023-02-18 18:00:34 +01:00
Dydzio
6bd4eac27a
Rename settings files
2023-02-18 17:58:22 +01:00
Dydzio
7137329e80
Clang-tidy related fixed
2023-02-18 17:49:43 +01:00
Dydzio
7e409df3cb
Apply manual changes from code review
2023-02-18 16:35:07 +01:00
Dydzio
c2ef3331ef
Change main settings tabs to toggle group + fix json commas
2023-02-16 21:37:37 +01:00
Dydzio
e48a4185ed
Use config values from new settings
2023-02-15 23:36:09 +01:00
Dydzio
ade52239ea
Use config value from new settings
2023-02-15 23:26:55 +01:00
Dydzio
9101f05835
Fixes for new battle settings
2023-02-15 22:38:41 +01:00
Dydzio
775db89241
Fix battle settings UI labels, add "dont show battle intro" setting
2023-02-15 20:29:29 +01:00
Dydzio
1d153f4ee9
"ForceMovementInfo" support + make other settings tab
2023-02-14 23:45:45 +01:00
Dydzio
daa2b63dde
Further UI improvements
2023-02-14 22:22:11 +01:00
Dydzio
be9c71934c
Merge remote-tracking branch 'origin/develop' into settings-rework
2023-02-14 21:00:17 +01:00
Dydzio
fb06aca0bb
Further progress - UI tweaks, new settings etc
2023-02-14 20:30:06 +01:00
Ivan Savenko
18d1823d44
Fix build
2023-02-14 11:32:20 +02:00
Ivan Savenko
72fe1fcfa9
Fix minimap updating on hero loss
2023-02-14 11:32:19 +02:00
Ivan Savenko
91b17bed79
Partial encapsulation of AdvMapInt
2023-02-14 11:18:42 +02:00
Ivan Savenko
e15c7dcd33
Attempt at better encapsulation of CTerrainRect
2023-02-14 11:18:41 +02:00
Ivan Savenko
89c29206f1
Internal classes of mapHandler are now in global namespace
2023-02-14 11:18:41 +02:00
Ivan Savenko
cc0c3e5bc9
All adventure map components now use shared_ptr
2023-02-14 11:18:41 +02:00
Ivan Savenko
f8c1c46562
removed CAdvMapInt::handleRightClick method
2023-02-14 11:18:41 +02:00
Ivan Savenko
d0f57fed6f
Cleaned up code of Minimap
2023-02-14 11:18:41 +02:00
Dydzio
80a5595d6c
Adding some settings options, minor UI fixes
2023-02-13 23:53:28 +01:00
Andrii Danylchenko
9f55666931
rework netpacks to avoid double typeinfo
2023-02-13 20:26:39 +02:00
SoundSSGood
0f93b0991c
Regression fixed
2023-02-13 15:16:42 +02:00
SoundSSGood
8504102c53
Merge branch 'vcmi:develop' into contitutient-swap
2023-02-13 09:51:42 +02:00
Andrii Danylchenko
e6b21ed298
Merge pull request #1574 from SoundSSGood/contitutient-move
...
combined art move
2023-02-13 08:30:35 +02:00
SoundSSGood
2976739c97
some refactoring
2023-02-12 21:27:37 +02:00
Dydzio
de5138c854
Basic separation of adventure map & general tabs
2023-02-12 19:25:59 +01:00
SoundSSGood
34a0dbc0b6
misc slots. fixed combined arts moving
2023-02-12 20:13:26 +02:00
Dydzio
58bed920b4
Sort out settings files structure
2023-02-12 17:49:41 +01:00
Dydzio
7430616ada
Move settings to separate subfolder
2023-02-12 17:29:23 +01:00
Konstantin
6d8eac320d
vcmi/client: add missing include to GUIclasses.cpp
...
Fix building with clang++ version 15.
2023-02-12 19:11:24 +03:00
Konstantin
3cf303f1c7
vcmi/client: make ColorRGBA constexpr
...
1. Replace overflowing int3 to ColorRGBA, which is more semantically
correct
2. Make ColorRGBA constexpr, to make sure than hardcoded colors can
be initialized in compile time
2023-02-12 19:11:24 +03:00
Dydzio
34227a0dab
Integrate new settings with battle UI
2023-02-12 15:49:17 +01:00
Dydzio
2f171fcc0e
Merge branch 'develop' into settings-rework
2023-02-12 15:03:33 +01:00
Dydzio
ee186f3839
Conversion of battle settings to configurable interface
2023-02-12 13:51:57 +01:00
Ivan Savenko
c8c38ac922
Merge pull request #1386 from IvanSavenko/resolutions_filter
...
Do not allow selecting resolutions not supported by display
2023-02-12 14:33:39 +02:00
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
Dydzio
a4cc386a5a
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-02-05 20:24:36 +01: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