Alexander Wilms
5cbc75d3b7
Merge remote-tracking branch 'upstream/develop' into develop
2023-10-29 13:35:37 +00:00
Alexander Wilms
e677164ed0
client/widgets/Buttons.h: Fix const reference
...
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2023-10-29 13:34:19 +00:00
Alexander Wilms
5d7b83c10b
client/widgets/Buttons.cpp: Fix const reference
...
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2023-10-29 13:34:19 +00:00
Alexander Wilms
466cdb9d2b
client/widgetsImages.{h,cpp}: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char')
2023-10-29 13:34:19 +00:00
Alexander Wilms
f1bb6b999c
client/widgets/Buttons.{h,cpp}: Pass expensive to copy object "callback" by reference to const.
2023-10-29 13:33:57 +00:00
Ivan Savenko
5523f05284
Moved ArtifactLocation to a separate file
2023-10-23 19:02:28 +03:00
Ivan Savenko
b88a8da4e8
Split off some netpack structures into separate files
2023-10-23 13:59:15 +03:00
Ivan Savenko
acc8e9db32
Merge pull request #3082 from SoundSSGood/crash-hotfix
...
Сrash fixed and little optimization
2023-10-22 12:01:28 +03:00
Nordsoft91
f3acc939b9
Merge pull request #3062 from Laserlicht/sort_towns
...
sort town/hero feature
2023-10-20 22:51:26 +02:00
SoundSSGood
068a7d5d4a
crash fixed
2023-10-20 01:11:10 +03:00
Nordsoft91
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change
...
possibility to change name in lobby
2023-10-16 22:28:31 +02:00
Laserlicht
f6843c0574
fix focus problem
2023-10-16 01:39:53 +02:00
Laserlicht
aeb559efb8
code review
2023-10-16 00:04:29 +02:00
Laserlicht
3b853bff08
sort town feature
2023-10-15 14:31:33 +02:00
Laserlicht
7217992898
code review
2023-10-14 12:08:38 +02:00
Laserlicht
b89cdda718
Tavern also in infobox & haptics
2023-10-13 23:36:51 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name
2023-10-13 23:04:35 +02:00
Laserlicht
08832eeeb4
fix
2023-10-13 19:56:56 +02:00
Laserlicht
9e508fe2c2
interface improvements
2023-10-13 19:56:56 +02:00
Laserlicht
fa9d5e9971
show missing resources
2023-10-09 21:43:43 +02:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
e322d0a084
Merge pull request #2966 from IvanSavenko/simplify_ui_lock
...
Simplified locking of game UI state
2023-10-04 16:50:23 +03:00
Ivan Savenko
b21a361b99
Merge pull request #2814 from SoundSSGood/arts-counter-impovements
...
Artifacts counter impovements
2023-10-01 17:53:51 +03:00
Ivan Savenko
0dcfd6e65c
Removed optional locking in waitWhileDialog method
2023-09-27 18:44:08 +03:00
Ivan Savenko
97097c20ad
Merge pull request #2874 from SoundSSGood/exchange-window-update
...
Exchange window update
2023-09-27 15:50:52 +03:00
Nordsoft91
8c6381b497
Merge pull request #2951 from Laserlicht/spell_icon
...
specific spell icon (artifacts)
2023-09-26 20:13:19 +02:00
Laserlicht
ac5f552219
fix
2023-09-26 15:56:39 +02:00
Laserlicht
93e2826e3e
new constructor
2023-09-26 15:53:44 +02:00
Laserlicht
ab55615359
remove double code
2023-09-26 10:28:10 +02:00
Laserlicht
6b5f6030e2
header
2023-09-25 23:02:16 +02:00
Laserlicht
096036dc9f
spell icon
2023-09-25 22:58:59 +02:00
Laserlicht
7cf654992f
code review
2023-09-25 16:34:36 +02:00
Laserlicht
28f4046937
ready
2023-09-25 01:04:06 +02:00
SoundSSGood
6280e778dc
fix build
2023-09-19 16:04:37 +03:00
SoundSSGood
9cc623c981
Fixed move checks. Backpack buttons.
2023-09-19 13:31:59 +03:00
SoundSSGood
f47def3588
refactoring
2023-09-19 13:31:57 +03:00
Laserlicht
05fad115b5
Added new Widgets an functions for simplification
2023-09-17 20:34:31 +02:00
Nordsoft91
717a765123
Merge pull request #2813 from Laserlicht/textcolor
...
Textcolor support
2023-09-16 14:12:17 +02:00
Laserlicht
063c7f3ca0
move function; optional; json static
2023-09-15 15:27:26 +02:00
Laserlicht
f5505c9f6d
support for predefined colors
2023-09-15 15:27:26 +02:00
Laserlicht
d948cb72a0
Alignment
2023-09-15 15:27:26 +02:00
Laserlicht
dd4c95bd04
textcolor
2023-09-15 15:27:26 +02:00
Laserlicht
03316c62bf
Easy choosing for a secondary skill in Level Up Dialog by double clicking it
2023-09-15 15:24:17 +02:00
SoundSSGood
82eb2f8a2b
Artifact assembling changes
2023-09-12 19:17:35 +03:00
Ivan Savenko
e8453916cf
Merge remote-tracking branch 'vcmi/beta' into develop
2023-09-08 18:49:06 +03:00
Ivan Savenko
fccd564d8d
Merge pull request #2769 from IvanSavenko/touch_tolerance
...
(1.3.2) Implemented tolerance for touch events
2023-09-08 16:45:04 +03:00
Ivan Savenko
635884cb05
Replaced show unit info with fill with one's option in radial
2023-09-07 13:55:58 +03:00
SoundSSGood
1b810b5b93
combined arts assembling fixed
2023-09-07 11:54:52 +03:00
SoundSSGood
f1a6116088
CHeroArea fix
2023-09-07 11:54:50 +03:00
SoundSSGood
3675d88730
fixed highlighting slots
2023-09-07 11:39:29 +03:00
Ivan Savenko
3973624278
Implemented tolerance for touch events
2023-09-06 01:06:01 +03:00
SoundSSGood
a7cedea73c
Support for different backpack capacities
2023-09-04 20:59:24 +03:00
Ivan Savenko
1d0e696db6
Added RenderHandler that acts as factory for images and animations
2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07
Always use ResourcePath for referencing images and animations
2023-09-04 18:22:34 +03:00
Ivan Savenko
7255dda624
Merge pull request #2629 from dydzio0614/neutral-creature-popup
...
Improve neutral creature adventure map popup
2023-08-31 15:44:19 +03:00
Dydzio
e1e41d1107
Implement TOPCENTER text alignment
2023-08-30 00:35:31 +02:00
Ivan Savenko
695a51d8c8
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-28 21:19:53 +03:00
Ivan Savenko
5be87b30c1
Merge pull request #2625 from dydzio0614/artifacts-backpack-gui
...
Artifacts backpack GUI
2023-08-28 19:59:11 +03:00
nordsoft
439254f921
Fix mistake
2023-08-28 17:21:38 +04:00
nordsoft
49a76ac14c
Code review tweaks
2023-08-28 17:21:38 +04:00
nordsoft
de8bd48398
Added right click pop-up for text inputs
2023-08-28 17:21:38 +04:00
nordsoft
d758727c23
Basic timer ui is almost complete
2023-08-28 17:10:52 +04:00
nordsoft
c7ded69edc
Minor changes
2023-08-28 17:10:52 +04:00
nordsoft
c064b805c2
Refactor combo box
2023-08-28 17:10:52 +04:00
nordsoft
39fbdd300d
Refactor combo box
2023-08-28 17:10:52 +04:00
Ivan Savenko
e54287ea5d
Converted remaining identifier to new system
2023-08-25 13:38:02 +03:00
Ivan Savenko
17d3d663ee
Converted creature ID and spell ID to new form
2023-08-25 13:38:02 +03:00
SoundSSGood
730ab449b6
backpack window fix
2023-08-25 10:08:08 +03:00
Dydzio
b73f9325ad
Fixes from code review
2023-08-21 16:56:50 +02:00
Dydzio
ed12f20609
Improve neutral creature adventure map popup
2023-08-21 14:42:41 +02:00
Dydzio
b53894ac2d
Add artifact slots backgrounds
2023-08-20 18:57:53 +02:00
Dydzio
f24910e5d2
Artifacts backpack window GUI improvements
2023-08-20 00:52:03 +02:00
Ivan Savenko
f13a53c1d9
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-12 17:28:47 +03:00
Ivan Savenko
c8ec0d5419
Added caching for creature icons in garrisons
...
More complete version of caching will be done for 1.4
Fixes freezes on hero movement when hota mod is used
2023-08-05 14:26:54 +03:00
Ivan Savenko
ab4fb2a228
Prefer composition over inheritance
2023-08-05 14:25:57 +03:00
Ivan Savenko
537f9fa048
Merged master into develop
2023-08-03 23:38:32 +03:00
Ivan Savenko
723c674d81
Merge pull request #2447 from IvanSavenko/modding_handler_refactoring
...
(develop) Modding handler refactoring
2023-08-02 21:26:05 +03:00
Ivan Savenko
43795c39a5
Replaced all usage of SDL_Color outside of render with ColorRGBA
2023-07-31 21:07:30 +03:00
Ivan Savenko
62fddca21e
Split massive CModHandler class/file into multiple parts:
...
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
Michael
aaa115cf4b
Button-Sound -> haptic feedback
2023-07-29 00:11:16 +02:00
Michael
ce00069dcd
haptic feedback on radial menu action
2023-07-23 15:17:30 +02:00
Ivan Savenko
1acc936e51
Do not activate radial wheel if cursor stays in the center
2023-07-21 17:01:53 +03:00
Ivan Savenko
6cd219738b
Added option to disable radial wheel in config (no UI)
2023-07-21 15:47:42 +03:00
Ivan Savenko
3a3306863a
Moved new texts to config
2023-07-21 15:47:42 +03:00
Ivan Savenko
e2ad8bbf58
Added initial version of selection highlight
2023-07-21 15:47:42 +03:00
Ivan Savenko
816adecca0
Added "split stack" action to wheel
2023-07-21 15:47:42 +03:00
Ivan Savenko
cb28a90a3b
Create items only if action is possible
2023-07-21 15:47:42 +03:00
Ivan Savenko
a45a0d1c40
Activate nearest radial menu item, even if not hovered
2023-07-21 15:47:42 +03:00
Ivan Savenko
5b2ac27e90
Fix slot positioning
2023-07-21 15:47:42 +03:00
Ivan Savenko
f3508bdfda
Show option description on hovering
2023-07-21 15:47:42 +03:00
Ivan Savenko
8c4faa24f4
Add alpha channel to radial menu items
2023-07-21 15:47:42 +03:00
Ivan Savenko
e3f5ab57f2
Fixed input event ordering. Fixes radial menu show/hide logic
2023-07-21 15:47:42 +03:00
Ivan Savenko
d26595cef7
Radial menu is now a proper window. Minor fixes to positioning.
2023-07-21 15:47:42 +03:00
Ivan Savenko
a494dc4870
Refactoring of CGarrisonInt
2023-07-21 15:47:42 +03:00
Ivan Savenko
dca3785f84
Initial version of radial wheel for army management
2023-07-21 15:47:42 +03:00
Ivan Savenko
3f4e88c396
Merge pull request #2325 from SoundSSGood/hero-backpack-window
...
Hero backpack window prototyping
2023-07-21 15:43:34 +03:00
SoundSSGood
ca977d7105
backpack window slider
2023-07-18 21:01:55 +03:00
SoundSSGood
b1351d8532
two scrolling modes demo
2023-07-16 21:16:12 +03:00
Dydzio
ee663b1595
Changes from code review
2023-07-16 15:56:42 +02:00
Dydzio
dbfcb5a749
Implement interactable town tooltip
2023-07-16 10:17:37 +02:00
Dydzio
ea0ee87299
Interactable hero status - alternative infobox component
2023-07-15 23:14:59 +02:00
Dydzio
484d03334c
New garrison interface layout: Reversed two rows + labels below slot
2023-07-15 23:11:21 +02:00
SoundSSGood
9427de6344
initial files
2023-07-15 22:15:32 +03:00
SoundSSGood
3ea6f530ad
backpack window initial
2023-07-15 22:15:32 +03:00
Ivan Savenko
9ef959a7f8
Merge pull request #2310 from IvanSavenko/left_click_refactor
...
Left click input refactor
2023-07-13 13:03:06 +03:00
Ivan Savenko
9acab48bc3
Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
...
CArtifact CArtifactInstance refactoring
2023-07-11 14:36:08 +03:00
Ivan Savenko
18db944083
Replaced clickReleased with clickPressed where applicable in H3
2023-07-09 17:48:25 +03:00
Ivan Savenko
9449899098
Fix regressions
2023-07-09 17:08:37 +03:00
Ivan Savenko
ca889a5c2a
Replaced clickLeft with clickPressed clickReleased methods
2023-07-08 14:33:04 +03:00
Ivan Savenko
2a634b2ec0
Fixed UI updates on switching to/from fullscreen
2023-07-07 15:26:42 +03:00
Ivan Savenko
41755c9d87
Fix slider scroll via UI buttons
2023-07-07 01:23:17 +03:00
Ivan Savenko
b775385179
Fix usage of left/right button to select amounts, e.g. in recruit screen
2023-07-04 21:35:26 +03:00
Ivan Savenko
1dff721747
Fix infobox resetting to current hero during enemy turn
2023-07-04 20:28:02 +03:00
Ivan Savenko
900b1c1763
Simplified text input handling, fixes hotkeys on windows with text input
2023-07-04 18:42:52 +03:00
SoundSSGood
fd9c7352a0
suggested changes
2023-07-03 22:54:03 +03:00
Ivan Savenko
8b61c0d59b
Replaced CIntObject::type bitfield with bool's. Added input blocking.
2023-07-03 19:24:12 +03:00
SoundSSGood
060aecc61c
CArtifact refactoring
2023-06-30 19:41:26 +03:00
SoundSSGood
d44821e733
CArtifactInstance moved to own file
2023-06-30 19:41:19 +03:00
SoundSSGood
f8023ad283
CScrollArtifactInstance
2023-06-30 19:41:04 +03:00
SoundSSGood
07c811dd67
CCombinedArtifactInstance refactoring
2023-06-30 19:40:57 +03:00
Ivan Savenko
9cd246ab8b
Merge pull request #2259 from IvanSavenko/campaign_refactoring
...
Fix accumulated issues with campaigns
2023-06-30 12:59:48 +03:00
Mike
c35d9d66a6
Brought back missing fort level in info box
...
This is to fix #2158
2023-06-28 22:21:34 -07:00
Ivan Savenko
85262cf4f5
Moved CGameState files into a separate directory
2023-06-26 17:15:59 +03:00
Ivan Savenko
a505cc464e
Fixed slider's behavior, especially for mobile systems
2023-06-22 23:49:38 +03:00
Ivan Savenko
4e7412faa6
Split mouseDragged event from mouseMoved
2023-06-22 22:11:48 +03:00
Ivan Savenko
06437cbde6
Renamed gesture-related methods, remove unused code
2023-06-20 19:58:05 +03:00
Ivan Savenko
563d7dd41f
Renamed RCLICK -> SHOW_POPUP
2023-06-20 19:58:05 +03:00
Ivan Savenko
8ad577255f
Replaced isMouseButtonPressed with isMouseLeftButtonPressed
2023-06-20 19:58:05 +03:00
Ivan Savenko
d4aa778547
Replaced clickRight event with showPopupWindow/closePopupWindow
2023-06-20 19:58:05 +03:00
SoundSSGood
f6c2d5cba7
hotfix
2023-06-07 13:08:04 +03:00
Ivan Savenko
b20109c830
Test version of swipe gesture for in-combat attacks
2023-06-05 19:20:08 +03:00
Ivan Savenko
0e36a3ab5a
Use Scrollable class for all appropriate locations
2023-06-05 19:18:33 +03:00
Ivan Savenko
052d0d314a
Implemented Scrollable class, to server as common base for such classes
2023-06-05 19:17:04 +03:00
Ivan Savenko
6fe00ad55c
Moved slider class to a separate file
2023-06-05 19:16:01 +03:00
Ivan Savenko
360bf48031
Implemented panning/swiping gesture for sliders
2023-06-05 19:09:56 +03:00
Ivan Savenko
dc8e9cd048
wheelScrolled event now accepts distance instead of bool
2023-06-05 19:00:57 +03:00
Ivan Savenko
e2a85e25fa
Removed old code
2023-06-05 19:00:57 +03:00
Ivan Savenko
1e9eea30e1
Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop
2023-06-05 18:53:17 +03:00
Ivan Savenko
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
Ivan Savenko
a4000f2fc8
Removed isActive(int) method since its usages were redundant or wrong
2023-05-20 01:51:49 +03:00
Ivan Savenko
c77f8482e3
Replaced event handling break system with key capturing
2023-05-20 01:51:49 +03:00
Ivan Savenko
0e70f2998f
SDL event handling is now done exclusively in input handler
2023-05-20 01:51:49 +03:00
Ivan Savenko
ff1c94541f
Fix button interaction with hotkey & mouse
2023-05-20 01:51:49 +03:00
Ivan Savenko
1f513fd280
Extracted event management from GuiHandler and CIntObject
2023-05-20 01:51:49 +03:00
SoundSSGood
1175990724
fixup
2023-05-19 01:55:11 +03:00
SoundSSGood
021f94a579
artifact utils
2023-05-17 17:00:31 +03:00
Ivan Savenko
ad3e54e6c0
Reduced usage of topWindow() method
2023-05-16 21:57:45 +03:00
Ivan Savenko
e2ef136003
Renamed "Int" -> "Window" in WindowHandler API
2023-05-16 19:10:22 +03:00
Ivan Savenko
7838190ef4
Moved window stack management from GuiHandler to new class
2023-05-16 19:10:21 +03:00
Ivan Savenko
fa496628f2
Separated timer updates from rendering in adventure map and town screen
2023-05-14 22:22:37 +03:00
