959 Commits

Author	SHA1	Message	Date
Laserlicht	21f37cfafb	simplified	2023-09-17 21:41:55 +02:00
Laserlicht	05fad115b5	Added new Widgets an functions for simplification	2023-09-17 20:34:31 +02:00
Laserlicht	d33101187b	simplify	2023-09-17 16:55:26 +02:00
Laserlicht	a994fa00aa	fixes; translation	2023-09-17 16:15:17 +02:00
Laserlicht	69da4d59bf	basic function ready	2023-09-17 15:28:05 +02:00
Laserlicht	cfc5bac540	layout	2023-09-17 14:31:07 +02:00
Laserlicht	59b5c46a32	right side draft	2023-09-17 13:22:39 +02:00
Laserlicht	79e872da68	left side ready	2023-09-17 04:10:08 +02:00
Laserlicht	b674682fe3	left side	2023-09-17 03:21:29 +02:00
Laserlicht	73fe924544	draw background	2023-09-17 02:14:03 +02:00
Laserlicht	ff96b1af0a	initial hero overview	2023-09-17 00:32:10 +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	922a775108	Update CMessage.h	2023-09-15 15:27:26 +02:00
Laserlicht	f5505c9f6d	support for predefined colors	2023-09-15 15:27:26 +02:00
Laserlicht	f776422c67	color linesplit	2023-09-15 15:27:26 +02:00
Laserlicht	d948cb72a0	Alignment	2023-09-15 15:27:26 +02:00
Laserlicht	39838fdd3c	extend for all selections	2023-09-15 15:24:17 +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
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Dydzio	56c969be4f	Fix commanders requirements for special skills to match WoG	2023-09-13 23:08:22 +02:00
Ivan Savenko	d070953c28	Fix open backpack strings	2023-09-12 21:28:36 +03:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	72858cd0d8	Merge pull request #2768 from IvanSavenko/cherry_picked_fixes ... (1.3.2) Cherry picked fixes	2023-09-08 13:15:34 +03:00
SoundSSGood	f1a6116088	CHeroArea fix	2023-09-07 11:54:50 +03:00
Ivan Savenko	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Gwart	707400d764	#2646 add a null check if creature is empty	2023-09-05 23:32:12 +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	9cfcf5ea19	Fix regressions	2023-09-04 18:22:34 +03:00
Ivan Savenko	0f88b8969b	Removed some usages of std string as resource path	2023-09-04 18:22:34 +03:00
Ivan Savenko	97b7d44c88	Use ResourcePath for video accessing	2023-09-04 18:22:34 +03:00
Ivan Savenko	6f0108e462	Use ResourcePath for referencing texts and json's	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
Gwart	05ba56a873	#2646 add a null check if creature is empty	2023-09-02 16:21:54 +02: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
Ivan Savenko	3ce99e8613	Merge pull request #2710 from dydzio0614/artifacts-backpack-graphics ... Split artifacts bag button background and icon	2023-08-31 15:42:50 +03:00
Dydzio	e1e41d1107	Implement TOPCENTER text alignment	2023-08-30 00:35:31 +02:00
Dydzio	03ef5b6b0f	Split artifacts bag button background and icon	2023-08-29 18:53:50 +02:00
Dydzio	bafe8baa15	Fix "ghost" icons in commander grandmaster abilities list	2023-08-29 00:20:44 +02:00
Dydzio	2769782d0a	Fix broken grandmaster ability description updating on select/deselect	2023-08-28 23:49:07 +02:00
Dydzio	dacf6c9d08	Add border around selected commander "grandmaster ability" on levelup	2023-08-28 23:36:45 +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
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	0240ee886d	Converted (almost) all namespace enum's to enum classes	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	43096f0ed1	Merge pull request #2617 from dydzio0614/configurable-autobattle-spells ... Configurable autobattle spells usage	2023-08-25 01:29:16 +03:00
Konstantin	d746a96d55	vcmi: use SpellSchool identifier instead of enum ... Use identifier instead of enum inside callbacks. It is better and more expandable solution.	2023-08-23 17:53:09 +03:00
Konstantin	344593e891	vcmi: made some CSpell properties private ... There are getters for it.	2023-08-23 17:53:08 +03:00
Konstantin	8724181a0f	vcmi: spell resistance rework ... Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY. All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY, and all previous bonuses of subtype 1 is covered by NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.	2023-08-23 17:52:16 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Dydzio	28fe28adf5	Fix player coloring	2023-08-21 17:08:15 +02:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Dydzio	f24910e5d2	Artifacts backpack window GUI improvements	2023-08-20 00:52:03 +02:00
Dydzio	f409b6ced9	Fix counting wood mines starting from 8 in kingdom overview	2023-08-19 21:09:02 +02:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
SoundSSGood	119d51d1ef	altar sacrifice all fix	2023-08-11 18:51:59 +03:00
Ivan Savenko	ad2bd897d0	Replace boost::format with MetaString ... Looks like some of H3 localizations don't have string replacements for building / war machine name, resulting in exceptions on formatting attempt. MetaString handles this case silently.	2023-08-11 18:50:39 +03:00
Ivan Savenko	0dca5c45bd	Workaround for potential crash on opening town dwelling with no valid ... creatures	2023-08-06 12:46:29 +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
Ivan Savenko	5d2dd4c633	Show creature popup window on right-click in town fort	2023-07-30 15:29:18 +03:00
Ivan Savenko	01d588ab54	Fix keyboard shortcuts on selection dialogs	2023-07-22 22:29:05 +03:00
Ivan Savenko	a494dc4870	Refactoring of CGarrisonInt	2023-07-21 15:47:42 +03:00
Ivan Savenko	cefbe5152e	Merge pull request #2359 from IvanSavenko/crashfixing ... Fix crashes from 1.2.1 statistics on Google Play	2023-07-21 15:44:37 +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
Ivan Savenko	ddda46a7fd	Merge pull request #2358 from dydzio0614/persistent-hero-info-window ... Add option for persistent hero info window as in HD mod	2023-07-19 14:46:16 +03:00
Ivan Savenko	ab6a4be105	Merge pull request #2357 from SoundSSGood/picked-art-fix ... Fixed hero skills if artifact picked	2023-07-19 14:45:58 +03:00
SoundSSGood	ca977d7105	backpack window slider	2023-07-18 21:01:55 +03:00
Ivan Savenko	c7d88271a9	Removed asynchronous calls from exchange window	2023-07-18 17:31:21 +03:00
Ivan Savenko	317183e00d	Merge branch 'develop' into info-box-army-management	2023-07-18 16:05:09 +03:00
Dydzio	48a72f90f7	Add option for persistent hero info window as in HD mod	2023-07-17 23:25:16 +02:00
SoundSSGood	ff278d5f3a	cleanup unused	2023-07-17 22:26:21 +03:00
SoundSSGood	f33dec9337	picked art fixed	2023-07-17 22:24:43 +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	fe26ab4501	Add settings entry, immediately refresh info bar on setting toggle	2023-07-16 14:52:43 +02:00
Ivan Savenko	61750d30c2	Implemented dragging map via left mouse click (off by default)	2023-07-16 12:00:40 +03: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	8129cbc514	Allow dismissing hero from town	2023-07-15 16:09:44 +03:00
Ivan Savenko	3e8debc243	Allow dismissing heroes from kingdom overview window	2023-07-15 16:09:44 +03:00
Ivan Savenko	8a92941681	Allow merging stack on recruitment to give place for recruited unit	2023-07-15 16:09:44 +03:00
Ivan Savenko	8dc009e2c9	Always show correct game resolution in settings, unaffected by scaling	2023-07-15 16:09:44 +03:00
Ivan Savenko	e4e353449e	Recreate screen on UI scaling change	2023-07-15 16:09:44 +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	b30db5fc1f	Merge pull request #2301 from Laserlicht/haptic_feedback ... Haptic feedback	2023-07-13 12:56:54 +03:00
Michael	1abd8bbe92	Update client/windows/settings/GeneralOptionsTab.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-12 22:56:35 +02: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
Michael	ff51b8f46b	Setting for haptic feedback	2023-07-08 18:47:38 +02: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	ae8579558d	Merge pull request #2282 from IvanSavenko/adventure_map_fixes ... Adventure map fixes for 1.3	2023-07-07 14:27:58 +03:00
Mike	6414e3b3fc	Changed resource cost value label position	2023-07-05 18:43:52 -07:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
Ivan Savenko	8b61c0d59b	Replaced CIntObject::type bitfield with bool's. Added input blocking.	2023-07-03 19:24:12 +03:00
Ivan Savenko	0f8d53e978	Replaced SDL user events list with dispatching of arbitrary functors	2023-06-26 21:51:10 +03:00
Ivan Savenko	3d66455cd1	Fix build	2023-06-26 19:44:38 +03:00
Ivan Savenko	f6b2f58da9	Use inheritance instead of composition for campaign header	2023-06-26 17:15:59 +03:00
Ivan Savenko	a08fe09517	Added encapsulation for CampaignState class	2023-06-26 17:15:59 +03:00
Ivan Savenko	8420a90aa4	Reorganization of campaigns code	2023-06-26 17:15:59 +03:00
Ivan Savenko	d1e5a347ff	Refactoring of campaign handler: rename types and use strong typing	2023-06-26 17:15:59 +03:00
Ivan Savenko	85262cf4f5	Moved CGameState files into a separate directory	2023-06-26 17:15:59 +03:00
Ivan Savenko	a84ccb37c2	Merge pull request #2250 from IvanSavenko/event_handling_fixes ... Slider input event fix	2023-06-25 17:39:55 +03:00
krs	afe0146021	Renamed settings option to reflect that same option is used for both ranges.	2023-06-23 19:50:39 +03:00
Ivan Savenko	69dc95c3c8	Merge pull request #2235 from IvanSavenko/hota_h3m_support ... Hota h3m support	2023-06-23 13:32:10 +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	108688389e	Fix accessing potentially non-existing UI element	2023-06-20 19:58:05 +03:00
Ivan Savenko	ffdac314e9	Added selection of long touch duration	2023-06-20 19:58:05 +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	82288996a2	Fix cursor visibility on closing popup	2023-06-20 19:58:05 +03:00
Ivan Savenko	85a11c090e	Enter popup await mode only if there is an active popup	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
Ivan Savenko	56d69e790b	Renamed MetaString methods to more logical names	2023-06-20 19:37:27 +03:00
Ivan Savenko	2636a0dcc3	Moved MetaString to a new file	2023-06-20 19:37:27 +03:00
Ivan Savenko	f35b3a0dc3	Replace MetaString operator << with member function	2023-06-20 19:37:27 +03:00
Ivan Savenko	487f441f47	Implemented boat selection for town shipyards	2023-06-16 17:59:49 +03:00
krs	c0591573bf	Working Version	2023-06-11 18:40:47 +03:00
Ivan Savenko	6283329aeb	Added option to disable edge scrolling	2023-06-05 19:20:20 +03:00
Ivan Savenko	a08ff1e6ef	Removed no longer used touchscreen option	2023-06-05 19:20:08 +03:00
Ivan Savenko	b20109c830	Test version of swipe gesture for in-combat attacks	2023-06-05 19:20:08 +03:00
Ivan Savenko	70155b48e1	Only show touchscreen options on systems that have one	2023-06-05 19:20:08 +03:00
Ivan Savenko	2c7b94d17f	Remove unused map swipe option	2023-06-05 19:20:08 +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	e2a85e25fa	Removed old code	2023-06-05 19:00:57 +03:00
Ivan Savenko	48859e186e	Added panning gesture, activated by mouse wheel press	2023-06-05 19:00:56 +03:00
Ivan Savenko	1e9eea30e1	Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop	2023-06-05 18:53:17 +03:00
Ivan Savenko	8d278e653f	Merge pull request #2202 from IvanSavenko/map_objects_reorganization ... Map objects code reorganization	2023-06-05 18:35:05 +03:00
Ivan Savenko	d6a357fd17	Split some map object files into smaller files. Reduced includes usage.	2023-06-02 21:47:37 +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	acac42291e	Remove excessive CMap.h includes	2023-05-31 23:18:38 +03:00
Ivan Savenko	2c3e8c3390	Merge pull request #2168 from IvanSavenko/gui_handler_event_handling_refactoring ... Event handling refactoring	2023-05-23 15:08:10 +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	d5d0ca96a8	Minor fixes and cleanup	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
Ivan Savenko	06b6f59107	Resolution selector will now correctly update in borderless window mode	2023-05-19 23:54:43 +03:00
Ivan Savenko	20ec747440	Do not show desktop-only options on mobile systems	2023-05-19 23:19:43 +03:00
Ivan Savenko	d18b240d6d	Added separate borderless & exclusive fullscreen options	2023-05-19 22:43:52 +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	051a4a3c17	Encapsulation of WindowHandler state	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
Ivan Savenko	3ecdff2a21	FramerateManager now uses chrono instead of SDL_Ticks	2023-05-14 22:22:37 +03:00
Ivan Savenko	03df274450	Framerate manager is now in a separate file and private member of GH	2023-05-14 22:22:37 +03:00
Ivan Savenko	c5a48a01ce	Remove no longer used code	2023-05-09 13:10:33 +03:00
Ivan Savenko	243773b6ef	Renamed some adventure map files & classes	2023-05-09 13:10:33 +03:00
Ivan Savenko	e26b18c139	Rename & cleanup of WindowHandler -> ScreenHandler	2023-05-09 13:10:33 +03:00
Ivan Savenko	dbc4330fc5	Fixed positioning of resource bar and town list in other windows	2023-05-09 13:10:33 +03:00
Ivan Savenko	97d266ea2d	Remove duplicated resolutions, e.g. different frequency	2023-05-09 13:10:33 +03:00
Ivan Savenko	342ea138f9	Fix remaining graphical artifacts on switching from world view	2023-05-09 13:10:33 +03:00
Ivan Savenko	c24ccf663b	Fixed auto-enabling of status bar on windows activations	2023-05-09 13:10:33 +03:00
Ivan Savenko	77beca50e2	Hide resolution selector on mobile devices	2023-05-09 13:10:33 +03:00
Ivan Savenko	a0f1bf3928	Implemented user-selectable UI scaling mode	2023-05-09 13:10:33 +03:00
Ivan Savenko	a4b102e46f	Implemented UI scaling (non-selectable option for now)	2023-05-09 13:10:33 +03:00
Ivan Savenko	8d28f96619	Resolutions selector now shows all available resolutions	2023-05-09 13:10:33 +03:00
Ivan Savenko	c688411bab	Extracted window management from CMT to new class	2023-05-09 13:10:33 +03:00
Ivan Savenko	a015bf6507	Initial part of dynamically-sized adventure map: ... - removed no longer used CConfigHandler - remove no longer use resolutions.json - moved widget management from adventure map to a separate class - adventure map layout is now loaded from config	2023-05-09 13:10:33 +03:00
Konstantin P	057a33c508	SpellSchool: use identifier instead of int ... Needs redifinition of MAGIC_SCHOOL_SKILL in all mods	2023-05-07 20:37:32 +03:00
Konstantin	05eccbc2bb	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
Konstantin	fbc05c70ac	vcmi: camelCase methods of new classes ... Also use EGameSettings for clamping morale and luck	2023-05-02 12:09:13 +03:00
Konstantin	a6de9097be	vcmi: rename HeroBonus.h to Bonus.h	2023-05-02 11:20:58 +03:00
Konstantin	4866c2fe5c	vcmi: split IBonusBearer	2023-05-02 00:54:53 +03:00
Konstantin	b6eb2dc060	vcmi: rename IFactionMember and ICreature	2023-05-02 00:54:53 +03:00
Konstantin	6fa1b2b19f	vcmi: move bonuses to its own folder	2023-05-02 00:53:50 +03:00
Konstantin P	4b2a09dae7	FactionMember: move code around	2023-05-02 00:53:50 +03:00
Ivan Savenko	916b41d9a7	Merge pull request #2078 from IvanSavenko/shortcuts ... Basic shortcuts system	2023-05-01 21:45:52 +03:00
nordsoft	32277a007d	Fix compilation after merge	2023-05-01 21:49:37 +04:00
nordsoft	07b2052679	Bit refactoring	2023-05-01 21:49:37 +04:00
nordsoft	68fa7aaf35	Remove limitations for amount of skills	2023-05-01 21:49:37 +04:00
nordsoft	a4fd6c1c92	Move trading window title to config	2023-05-01 21:49:37 +04:00
nordsoft	07f7c318dc	Adjust client part for markets	2023-05-01 21:49:37 +04:00
nordsoft	4b1b58b617	Change Callback to abstract	2023-05-01 21:49:37 +04:00
nordsoft	59bc9326e9	Remove excess pointer from market interface	2023-05-01 21:49:37 +04:00
Ivan Savenko	dea10e6091	Use more descriptive names for hotkeys	2023-05-01 17:59:20 +03:00
Ivan Savenko	a654cc2391	Removed vstd::advance. Added vstd::next to handle similar cases.	2023-05-01 17:58:18 +03:00
Ivan Savenko	832e56e005	Implementation of (very basic) shortcuts system ... - Added EShortcut enumeration that contains all in-game shortcuts - CIntObject::keyPressed now receive values from hotkey enumeration - On keypress, SDL key code will be translated to shortcut ID - Removed access to SDL key codes from most of engine	2023-05-01 17:58:17 +03:00
Ivan Savenko	4aa232a60a	Merge pull request #2055 from SoundSSGood/cartifactholder-rework ... Artifact related code refactoring part2 (client CArtifactHolder)	2023-05-01 02:33:08 +03:00
SoundSSGood	8b531ca6c4	CArtifactHolder divided into files	2023-05-01 00:34:45 +03:00
Konstantin	86f5d6de69	vcmi: modernize headers	2023-04-30 13:35:54 +03:00
Ivan Savenko	d985ac90d3	Merge master -> develop	2023-04-28 22:57:25 +03:00
Ivan Savenko	76d5b459f1	Fixed music playback on switching between towns	2023-04-28 16:53:45 +03:00
Konstantin P	b472c89276	vcmi: make some CStack properties private ... There is a getters for this properties already available	2023-04-27 20:58:49 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
Ivan Savenko	48abf46824	Merge pull request #2005 from IvanSavenko/advmap_refactor ... Refactoring of adventure map interface	2023-04-24 17:19:22 +03:00
SoundSSGood	dcac8252f3	fixed windows positions	2023-04-23 14:57:45 +03:00