5340 Commits

Author	SHA1	Message	Date
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	dd4c95bd04	textcolor	2023-09-15 15:27:26 +02:00
Laserlicht	1c68937d95	new approach	2023-09-15 15:26:14 +02:00
Laserlicht	42d2257f19	VCMI credits	2023-09-15 15:26:14 +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
Laserlicht	19693d251d	comments	2023-09-15 15:15:33 +02:00
Laserlicht	6d69326c1a	alternative implementation	2023-09-15 15:15:33 +02:00
Laserlicht	8d160101ed	alt mode to select instead of changing path	2023-09-15 15:15:33 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Ivan Savenko	e2e4168966	Merge pull request #2828 from dydzio0614/commander-abilities-requirements ... Commander abilities requirements	2023-09-14 14:57:19 +03:00
Ivan Savenko	717fff3d28	Merge pull request #2822 from IvanSavenko/float_comparison_fix ... Attempt to fix freeze during map animations	2023-09-14 12:18:09 +03:00
Dydzio	56c969be4f	Fix commanders requirements for special skills to match WoG	2023-09-13 23:08:22 +02:00
Dydzio	aabb26d210	Erase outdated path that was previously available	2023-09-13 22:25:33 +02:00
Ivan Savenko	70d44d435e	Attempt to fix freeze during map animations	2023-09-13 18:48:36 +03:00
Laserlicht	9cf274362e	small folder optimation	2023-09-12 20:28:54 +02:00
Ivan Savenko	d070953c28	Fix open backpack strings	2023-09-12 21:28:36 +03:00
Ivan Savenko	538665fe42	Fix "Start game" blocking status: ... - Start game is now initially blocked - Receiving valid startInfo from server will unlock button	2023-09-12 21:15:15 +03:00
Ivan Savenko	60cbb939ab	Fix crash on window resize	2023-09-12 21:15:15 +03:00
Ivan Savenko	a09147a433	Do not block map layer toggles in world view mode	2023-09-12 21:15:14 +03:00
Ivan Savenko	a5e42755be	Correctly redraw map in world view mode	2023-09-12 21:15:14 +03:00
SoundSSGood	82eb2f8a2b	Artifact assembling changes	2023-09-12 19:17:35 +03:00
Nordsoft91	0a799ecc46	Merge pull request #2740 from Laserlicht/fix_cursor_issue	2023-09-11 22:20:11 +02:00
Laserlicht	994da3fcf2	code review	2023-09-11 14:44:07 +02:00
Laserlicht	fa19ed4e7c	format	2023-09-11 14:11:16 +02:00
Laserlicht	00f07f93d1	wait while audio playing; no audio on custom campaigns	2023-09-11 14:04:44 +02:00
Laserlicht	fc1ce85a72	basic voice support	2023-09-11 12:57:10 +02:00
Laserlicht	2cb28178ae	code review	2023-09-10 20:52:35 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	89c31d0d52	Fix typo	2023-09-08 16:54:51 +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	8112b8082e	Add new option to settings	2023-09-08 13:23:18 +03:00
Ivan Savenko	9e6424c545	Merge pull request #2775 from IvanSavenko/radial_fill_ones ... (1.3.2) Add "Fill with single creatures" option to radial wheel	2023-09-08 13:16:00 +03:00
Ivan Savenko	5d67481aaf	Merge pull request #2774 from IvanSavenko/beta_bugfixing ... (1.3.2) Beta bugfixing	2023-09-08 13:15:52 +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
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	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	346eead8e0	Show spell cursor when casting spell in touch input mode	2023-09-06 23:01:43 +03:00
Ivan Savenko	d7fb2bcf83	Show message on cancelling spell in combat	2023-09-06 21:54:26 +03:00
Ivan Savenko	9fa7a93fb0	Properly pass battleID in all battle netpack's	2023-09-06 16:03:47 +03:00
Ivan Savenko	747e28947a	Fix build	2023-09-06 16:03:47 +03:00
Ivan Savenko	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Ivan Savenko	036df2e0ad	Support multiple battles in AI	2023-09-06 16:03:46 +03:00
Michael	287c0daaff	add also savegame	2023-09-06 12:34:31 +03:00
Michael	36ab973dc8	fix difficulty widget	2023-09-06 12:34:23 +03:00
Ivan Savenko	3973624278	Implemented tolerance for touch events	2023-09-06 01:06:01 +03:00
Alexander Wilms	c0f0211098	Update VCMI icon (#2672) ... * Update VCMI icon Fixes #1993 Sources will be added to https://github.com/vcmi/vcmi-assets * Use entire canvas height for shield, add remaining icons * Use a slighty more saturated brown * Align VCMI letters to pixel grid for 32px icons * Align VCMI letters to pixel grid for 48px icon * Align VCMI letters to pixel grid for 64px icon * Add 96px icon to .ico * Update Android and iOS icons * Install 22px icon on Linux * Update macOS .icns file * Add more icons * Update iOS icons * Add more sizes to .ico files * Don't use .png inside .ico * Only include resolutions up to 256px in .ico files * Center map editor icon	2023-09-05 23:57:19 +03:00
Gwart	707400d764	#2646 add a null check if creature is empty	2023-09-05 23:32:12 +03:00
Ivan Savenko	64adb538fe	Do not allow stopping movement while using water walk over water	2023-09-05 23:32:02 +03:00
Ivan Savenko	63a8cd9642	Fix quest log button block status	2023-09-05 23:31:26 +03:00
Ivan Savenko	47249ee5ed	Fix resource bar UI in hotseat	2023-09-05 23:31:20 +03:00
Ivan Savenko	f7b67a5abe	Remove incorrect message on another player defeat	2023-09-05 23:31:14 +03:00
Ivan Savenko	5d1d559d81	Fix possible unprotected access to battleint	2023-09-05 23:31:07 +03:00
Ivan Savenko	211bcb6e82	Merge pull request #2720 from SoundSSGood/backpack-variable-cap ... Support for different backpack window capacities	2023-09-05 13:40:39 +03:00
Ivan Savenko	f30355839f	Fix build	2023-09-05 00:55:54 +03:00
Ivan Savenko	12c4f8d18c	Fixed serialization of PlayerColor in json	2023-09-04 22:22:24 +03:00
Ivan Savenko	86a7f5f5cd	Removed getStr(bool), replaced with similar toString()	2023-09-04 22:21:02 +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	8dfdfffd87	Use ResourcePath for audio files	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
Ivan Savenko	e2b5ff13f1	Merge pull request #2746 from wb180/teamsPopup ... Show only non-empty teams in teams popup	2023-09-03 22:23:32 +03:00
Ivan Savenko	7ccc8605ac	Merge pull request #2733 from SoundSSGood/empty-bulk-move-fix ... Arts bulk move crash fixed	2023-09-03 22:06:57 +03:00
Nordsoft91	2eaed0c983	Merge pull request #2743 from Laserlicht/fix_difficulty_widget ... [fix] difficulty widget	2023-09-03 17:57:43 +04:00
Nordsoft91	2057624cbc	Merge pull request #2741 from Laserlicht/folder_order ... [fix] folder order	2023-09-03 17:56:56 +04:00
Evgeniy Meshcheryakov	b6e2c454c0	Show only non-empty teams in teams popup	2023-09-03 08:05:02 +03:00
Michael	53277306cd	add also savegame	2023-09-02 20:39:16 +02:00
Michael	3d08518dac	fix difficulty widget	2023-09-02 19:37:56 +02:00
Michael	e0460a0dec	up should be first	2023-09-02 19:04:06 +02:00
Michael	20fd0d8901	fix cursor issue	2023-09-02 18:35:32 +02:00
Gwart	05ba56a873	#2646 add a null check if creature is empty	2023-09-02 16:21:54 +02:00
SoundSSGood	3126875e6a	arts bulk move crash fixed	2023-09-02 14:36:57 +03:00
Ivan Savenko	cab2bddf7e	Merge pull request #2712 from Laserlicht/dim_map ... Dim adventuremap	2023-09-01 22:37:10 +03:00
Alexander Wilms	d2f0a80573	Update VCMI icon (#2672) ... * Update VCMI icon Fixes #1993 Sources will be added to https://github.com/vcmi/vcmi-assets * Use entire canvas height for shield, add remaining icons * Use a slighty more saturated brown * Align VCMI letters to pixel grid for 32px icons * Align VCMI letters to pixel grid for 48px icon * Align VCMI letters to pixel grid for 64px icon * Add 96px icon to .ico * Update Android and iOS icons * Install 22px icon on Linux * Update macOS .icns file * Add more icons * Update iOS icons * Add more sizes to .ico files * Don't use .png inside .ico * Only include resolutions up to 256px in .ico files * Center map editor icon	2023-09-01 22:36:32 +03:00
Konstantin	e554a2766d	BattleActions: do not pass unnecessary targetStack ... It was unused for everything except teleport, so pass it only wher we attempt to teleport. Reworking sacrifice is out of scope from beta	2023-08-31 23:44:00 +03:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00
Michael	1721fe1ad6	optimize if disabled	2023-08-31 21:03:54 +02:00
Michael	3593911dde	improve readability	2023-08-31 21:00:02 +02:00
Ivan Savenko	ab2d4ba471	Merge pull request #2708 from Laserlicht/disable_unavilable_heroes ... disable unavailable heroes in selection	2023-08-31 15:45:32 +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
Ivan Savenko	a59d7b5fc9	Merge pull request #2687 from Nordsoft91/filledTexturePlayerColored ... Support FilledTexturePlayerColored in configurable interface	2023-08-31 15:43:40 +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
Ivan Savenko	2e411eca19	Do not allow stopping movement while using water walk over water	2023-08-31 01:38:16 +03:00
Michael	31e0558809	remove unneeded headers	2023-08-30 21:43:59 +02:00
Michael	e650f0100b	setting + all non popups	2023-08-30 21:41:28 +02:00
nordsoft	cc3ca9a41e	Timers fixes	2023-08-30 03:33:59 +04:00
nordsoft	9a42abe2a7	Extended timer info to exhange between client and server	2023-08-30 03:11:46 +04:00
Dydzio	e1e41d1107	Implement TOPCENTER text alignment	2023-08-30 00:35:31 +02:00
nordsoft	b4c20734f3	Support timer logic for pve and pvp	2023-08-30 02:17:29 +04:00
Michael	1d6469ab36	battlewindow	2023-08-29 22:43:37 +02:00
Michael	40c7ddcaf4	dim adventuremap	2023-08-29 22:22:22 +02:00
Michael	b6000841f1	code review	2023-08-29 21:08:18 +02:00
Dydzio	03ef5b6b0f	Split artifacts bag button background and icon	2023-08-29 18:53:50 +02:00
nordsoft	c8243313b8	Translations for turn timers	2023-08-29 14:53:15 +04:00
Michael	196cd41e35	fix multiplayer	2023-08-29 02:04:32 +02:00
Dydzio	bafe8baa15	Fix "ghost" icons in commander grandmaster abilities list	2023-08-29 00:20:44 +02:00
Michael	44ece25042	disable unavailable heroes	2023-08-29 00:14:49 +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	eafa9cbae1	Merge pull request #2684 from dydzio0614/creature-spellcasting-fixes ... Better default stack action handling + "F shortcut" mode fixes	2023-08-28 20:01:04 +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	a30939ad8e	Merge pull request #2685 from dydzio0614/mana-drain-ui-refresh ... Fix mana drain not refreshing battle hero window mana	2023-08-28 19:56:29 +03:00
nordsoft	432ed18579	Fix overlap of timer and fps widgets	2023-08-28 19:46:09 +04:00
nordsoft	b5417c667c	Hold timer client counter	2023-08-28 19:46:09 +04:00
nordsoft	4ee47b01ae	Make possible to play with different timers independently	2023-08-28 19:45:15 +04:00
nordsoft	71cbb0e2e7	Change query reply method	2023-08-28 18:56:36 +04:00
nordsoft	98f7ed9dfd	Implement player start turn query	2023-08-28 18:56:36 +04:00
nordsoft	78397d6d1a	Fix compiling	2023-08-28 17:21:38 +04: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	44791b6665	Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9" ... This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.	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	614a285fb8	Fix hot seat timer visualization	2023-08-28 17:21:38 +04:00
nordsoft	e4e9bcfb9b	Show time for other player during battle	2023-08-28 17:19:04 +04:00
nordsoft	fdaf05514a	Correct network data exchange and time parsing	2023-08-28 17:10:52 +04:00
nordsoft	1e527a6942	Minor changes	2023-08-28 17:10:52 +04:00
nordsoft	86e0ea15fb	Fix turn timer settings	2023-08-28 17:10:52 +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
Nordsoft91	1586c6c6a0	Merge pull request #2668 from IvanSavenko/remove_current_player ... Remove "currentPlayer" from gamestate	2023-08-28 17:10:28 +04:00
Nordsoft91	6394a77270	Merge pull request #2683 from Laserlicht/zoom_dead_area ... dead area for zooming	2023-08-28 17:09:15 +04:00
Nordsoft91	ffc4b989f0	Merge pull request #2679 from Laserlicht/smooth_scroll ... Smooth scroll	2023-08-28 17:08:57 +04:00
Michael	3c1892a7d2	adjust timing	2023-08-28 10:03:50 +02:00
Michael	220145bd9b	reintroduce setting to zero while holding	2023-08-28 00:59:08 +02:00
Michael	9f51f42128	use fps in calculation	2023-08-28 00:49:32 +02:00
Michael	b61890355f	Update MapViewController.cpp	2023-08-27 23:17:47 +02:00
Dydzio	cba9ddd66a	Update client/battle/BattleActionsController.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-08-27 23:01:04 +02:00
Michael	1c89c71031	Update MapViewController.cpp	2023-08-27 22:55:05 +02:00
Michael	3ce9d022d5	try to remove glitch	2023-08-27 22:00:20 +02:00
Michael	da3014bd54	Haptic feedback and increased dead zone	2023-08-27 21:40:56 +02:00
Michael	3960e5aa32	Update client/mapView/MapView.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-08-27 20:55:37 +02:00
nordsoft	3e502955b3	Support FilledTexturePlayerColored in configurable interface	2023-08-27 22:34:02 +04:00
Dydzio	321c9c2ca6	Remove now unused enum	2023-08-27 20:18:19 +02:00
Dydzio	207a73b9de	Fix mana drain not refreshing battle hero window mana	2023-08-27 18:58:07 +02:00
Dydzio	e1eb245565	Better default stack action handling + "F shortcut" mode fixes	2023-08-27 17:33:10 +02:00
Michael	f16b93c391	dead area for zoom	2023-08-27 14:00:40 +02:00
Michael	b77bccdc24	code review	2023-08-27 12:09:26 +02:00
Michael	d1d0d6d62e	fps independent	2023-08-27 02:35:10 +02:00
Michael	4137a66f2a	fix division by zero edge case	2023-08-27 00:53:09 +02:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Michael	bbd69fd430	added setting	2023-08-27 00:33:52 +02:00
Michael	4eecca2d9a	code review	2023-08-27 00:22:29 +02:00
Michael	6b71820197	avoid some edge cases	2023-08-26 23:25:46 +02:00
Michael	a354a7f696	compatible with older sdl	2023-08-26 22:30:02 +02:00
Michael	cde22b3755	fix	2023-08-26 21:37:29 +02:00
Michael	e57e9e8e9f	ready draft	2023-08-26 21:29:24 +02:00
Michael	2286e0c7b1	implement speed and move	2023-08-26 21:13:33 +02:00
Michael	fe6d96f4a0	angle calc	2023-08-26 20:19:25 +02:00
Michael	bd0f9bb280	preparation	2023-08-26 19:53:36 +02:00
Ivan Savenko	edd029c79c	Replace "currentPlayer" from gamestate with "activePlayers" ... - Allows multiple active players at once, e.g. simturns - Cleared up validation of netpacks by server, e.g. always check for pack sender	2023-08-25 18:56:15 +03:00
Ivan Savenko	b61c9a9e35	Fix build	2023-08-25 13:46:42 +03:00
Ivan Savenko	e2718db791	Converted several enumerations into constants	2023-08-25 13:38:02 +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	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	ec8d31bbfc	First step at unifying game identifiers code	2023-08-25 13:38:01 +03:00
SoundSSGood	730ab449b6	backpack window fix	2023-08-25 10:08:08 +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
Ivan Savenko	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Ivan Savenko	f9410145d6	Fix handling of "7 days without town" loss condition	2023-08-24 23:34:33 +03:00
Ivan Savenko	b057230d85	Fix quest log button block status	2023-08-24 23:34:33 +03:00
Ivan Savenko	c171a3d6be	Fix resource bar UI in hotseat	2023-08-24 23:34:33 +03:00
Ivan Savenko	97ef69c9ab	Remove incorrect message on another player defeat	2023-08-24 23:34:33 +03:00
Ivan Savenko	e40dc76304	Fix giving commands in battles in hotseat	2023-08-24 23:34:33 +03:00
Nordsoft91	979cf129bc	Merge pull request #2637 from Laserlicht/autosave	2023-08-25 00:09:49 +04:00
Nordsoft91	07210973f4	Merge pull request #2653 from Nordsoft91/turn-timer	2023-08-25 00:09:00 +04:00
Michael	37e2292720	count unicode chars to extra function	2023-08-24 18:34:00 +02:00
Andrii Danylchenko	f459c13bc3	Merge pull request #2661 from Nordsoft91/loading-bar ... Fix removing loading screen	2023-08-24 16:34:11 +03:00
nordsoft	6efccb2503	Fix removing loading screen	2023-08-24 15:01:43 +04:00
Michael	e6f1677d3a	missing header...	2023-08-23 23:34:33 +02:00
Michael	9f68a0bf49	avoid destroing utf-8; no extra Autosave text	2023-08-23 23:25:48 +02:00
Michael	485af4b4b5	avoid forbidden chars in path	2023-08-23 22:23:05 +02:00
Michael	b22a9ff2d0	Merge branch 'develop' into autosave	2023-08-23 21:39:04 +02:00
Michael	1586b9fbd1	possibility to restart	2023-08-23 21:37:44 +02:00
Michael	4784ae94b5	revert uuid	2023-08-23 20:03:40 +02:00
Ivan Savenko	a5501abd01	Fix skipping battle intro via click	2023-08-23 18:46:56 +03:00
Ivan Savenko	81242d3500	Fixed ending of battles due to retreat/surrender	2023-08-23 18:46:56 +03:00
nordsoft	b8ab64f448	Make options tab configurable	2023-08-23 19:29:50 +04: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	3eb19e6ed7	Fix possible unprotected access to battleint	2023-08-23 16:32:29 +03:00
Ivan Savenko	a44c08a847	Slightly better thread names	2023-08-23 16:32:29 +03:00
Ivan Savenko	0613756abc	Remove unused code	2023-08-23 16:32:29 +03:00
Ivan Savenko	dfe8ca3d61	Use more lightweight scoped_lock	2023-08-23 16:32:29 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Ivan Savenko	87957e74c1	Replaced boost::thread_specific_ptr with thread_local	2023-08-23 16:32:29 +03:00
Ivan Savenko	142889e3a5	Give all threads created by client human-readable name for debug	2023-08-23 16:32:29 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
Michael	d2bbe0f35a	starttime in foldername	2023-08-23 01:47:55 +02:00
Michael	fed9ae5157	Merge branch 'develop' into autosave	2023-08-23 00:37:15 +02:00
Michael	51ba22a631	code review	2023-08-23 00:35:44 +02:00
Nordsoft91	e09b13c00a	Merge pull request #2576 from Nordsoft91/turn-timer ... Implement turn timer feature	2023-08-23 01:48:12 +04:00
nordsoft	937935ce8c	Fix compiling (how does it work on mac?)	2023-08-23 01:20:29 +04:00
Michael	68a1b883eb	autosave folders	2023-08-22 20:43:44 +02:00
nordsoft	dfaf778d16	Redesign loading solution	2023-08-22 20:10:20 +04:00
nordsoft	d9a2a7bfd0	Fix minor points	2023-08-22 16:00:14 +04:00
Nordsoft91	ec4da06b56	Merge pull request #2631 from Laserlicht/date_alignment ... date alignment	2023-08-22 02:00:49 +04:00
nordsoft	d50edc28ab	Merge remote-tracking branch 'upstream/develop' into turn-timer ... # Conflicts: # server/CGameHandler.cpp # server/CGameHandler.h	2023-08-22 00:54:38 +04:00
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00
nordsoft	b1bfc2239f	Backward compatibility with mods	2023-08-22 00:32:26 +04:00
Michael	0dab3b83a0	date alignment	2023-08-21 20:45:00 +02:00
nordsoft	a60d503078	Fix progress bar	2023-08-21 19:21:32 +04:00
nordsoft	45f13c7964	Progress update on client side	2023-08-21 19:21:27 +04:00
nordsoft	584dd20943	Progress on server side for rmg	2023-08-21 19:21:22 +04:00
Dydzio	28fe28adf5	Fix player coloring	2023-08-21 17:08:15 +02:00
Dydzio	b73f9325ad	Fixes from code review	2023-08-21 16:56:50 +02:00
Ivan Savenko	1c552ba9d9	Remove unused code	2023-08-21 17:55:49 +03:00
Ivan Savenko	013417fb7e	Code cleanup	2023-08-21 17:55:49 +03:00
Ivan Savenko	6297140bf5	Start of stabilization - battles now start correctly	2023-08-21 17:55:49 +03:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Dydzio	ed12f20609	Improve neutral creature adventure map popup	2023-08-21 14:42:41 +02:00
Nordsoft91	4edee00a97	Merge pull request #2605 from Laserlicht/map_preview ... Map preview	2023-08-21 14:56:21 +04:00
Michael	05a88bd8ac	another try...	2023-08-20 23:34:09 +02:00
Michael	080630b39f	try to fix	2023-08-20 22:22:46 +02:00
Dydzio	b53894ac2d	Add artifact slots backgrounds	2023-08-20 18:57:53 +02:00
Dydzio	cab6fb76aa	Draft version of backpack button + new setting for original H3 UI mode	2023-08-20 17:45:43 +02:00
Michael	5c5576313b	handle long texts better; big window also for only one layer	2023-08-20 16:58:13 +02:00
nordsoft	989a0859ef	Fix tutorial loading	2023-08-20 17:58:40 +04:00
Nordsoft91	ef4fddd0c4	Merge pull request #2570 from Laserlicht/town_selection_window ... Town selection window	2023-08-20 17:37:45 +04:00
Michael	952ce3061b	avoid crash if any error in map	2023-08-20 14:28:10 +02:00
Michael	e3a4c65100	code review	2023-08-20 14:14:47 +02:00
Michael	1d94536299	code review	2023-08-20 13:16:39 +02:00
Michael	52ed824100	add sound; possibility to click outside to close	2023-08-20 13:05:25 +02:00
Ivan Savenko	b92e45d7b4	Merge pull request #2616 from dydzio0614/battle-hero-window-mana-fix ... Fix updating opponent hero spellpoints in battle window	2023-08-20 10:54:30 +03:00
nordsoft	a09cb23a85	Better handling other players for turn timer	2023-08-20 04:06:52 +04: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
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
Dydzio	6bfbe80cc9	Allow toggling quick combat spells usage	2023-08-19 17:23:55 +02:00
nordsoft	2fff74deea	Remove uninitialized variable	2023-08-19 18:59:31 +04:00
Nordsoft91	4a6deedd5e	Merge pull request #2530 from Nordsoft91/tutorial ... Support tutorial	2023-08-19 18:06:15 +04:00
Dydzio	6cb6a6d785	Fix updating opponent hero spellpoints in battle window	2023-08-18 20:24:31 +02:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Michael	8635c24166	fix	2023-08-18 00:15:47 +02:00
Michael	f9fa27b180	fix	2023-08-17 23:40:19 +02:00
Michael	e44f713f01	side by side map; player colors	2023-08-17 23:09:20 +02:00
Michael	af347242b4	fix compile error	2023-08-17 20:34:31 +02:00
Michael	ac64b9f2b5	fix	2023-08-17 18:52:00 +02:00
Michael	077ec65bf6	simplify	2023-08-17 18:15:42 +02:00
Michael	e61dc2ec23	constants	2023-08-17 17:54:53 +02:00
Michael	e1e16018d1	code review first batch	2023-08-17 17:29:31 +02:00
Ivan Savenko	ec0a51bd5c	Fixed border scrolling when game window is maximized	2023-08-17 12:25:02 +03:00
Michael	edc11fd451	Map preview initial draft	2023-08-17 09:56:50 +02:00
Ivan Savenko	074fd42d84	Added missing includes	2023-08-17 10:26:01 +03:00
Nordsoft91	96e820ddac	Merge pull request #2517 from Laserlicht/folders	2023-08-17 10:09:37 +04:00
nordsoft	647c7c15a3	Add sound notification for timer	2023-08-17 01:10:03 +04:00
Michael	71bcc611f5	review	2023-08-15 20:19:13 +02:00
Michael	0452dbd80d	remove copy of cropped asset	2023-08-14 23:08:20 +02:00
Michael	b2c8cab9f1	use playerColored	2023-08-14 22:22:43 +02:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
Tomasz Zieliński	c59014ce18	Merge remote-tracking branch 'origin/beta' into fix_rmg_teams	2023-08-14 18:59:45 +02:00
nordsoft	0c76ae89f8	Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2" ... This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.	2023-08-14 16:33:41 +04:00
nordsoft	e426924930	Close window at time expiring	2023-08-14 15:37:21 +04:00
nordsoft	0c38187916	Fix freezes while turn ends at hero move	2023-08-14 04:06:26 +04:00
Michael	079e8ba1ba	naming	2023-08-14 00:40:12 +02:00
Michael	7bfbfeb48f	missing	2023-08-14 00:16:53 +02:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
Michael	bb5ada3bb3	not from this PR	2023-08-14 00:10:06 +02:00
Michael	1d76f456ad	change servercode to make it more robust	2023-08-14 00:08:48 +02:00
nordsoft	f01973a4f0	Configurable turn timer	2023-08-14 01:13:37 +04:00
Michael	ae63088564	outline; squared	2023-08-13 22:58:49 +02:00
nordsoft	093e226bff	Fix compilation	2023-08-13 23:50:40 +04:00
Michael	9a63161866	added random; added names	2023-08-13 20:21:09 +02:00
Michael	e66a41e90b	simplify	2023-08-13 19:23:27 +02:00
Michael	c14448ee32	change design	2023-08-13 15:09:48 +02:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Ivan Savenko	abf7c48593	Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race ... Fix crash on video playback (and who knows how many more)	2023-08-13 00:45:24 +03:00
Michael	daa8bc547f	icon fix	2023-08-12 23:28:53 +02:00
Michael	f71f4a874b	Grid and Activaed	2023-08-12 22:59:45 +02:00
Michael	b73f9d6e30	calculate size	2023-08-12 21:50:40 +02:00
Michael	18b963f376	fix	2023-08-12 20:31:00 +02:00
Michael	3d08ecf024	rename	2023-08-12 20:02:36 +02:00
Michael	92159e57ef	Update SelectionTab.cpp ... fix possible -1	2023-08-12 19:51:18 +02:00
Michael	8bb7fd31cd	basically running...	2023-08-12 19:33:25 +02:00
Michael	481cd89dc8	drawing	2023-08-12 18:20:44 +02:00
Michael	c40c747ccf	saving states	2023-08-12 17:46:35 +02:00
Michael	876dc28e48	rework	2023-08-12 16:49:42 +02:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Michael	bc4d331888	Title	2023-08-12 15:19:40 +02:00
Michael	0c4f4daf70	base rendering	2023-08-12 15:05:26 +02:00
Michael	b4f6c7abab	big images; basic heroes support	2023-08-12 13:19:58 +02:00
Ivan Savenko	626664b8f6	Fix possible thread race on accessing GuiHandler from server handler ... thread without acquiring lock	2023-08-12 14:16:47 +03:00
Ivan Savenko	8cbc52364a	Merge pull request #2496 from IvanSavenko/saves_in_mods ... Allowed loading saves from inside mods	2023-08-12 11:27:15 +03:00
Ivan Savenko	e386309fbc	Merge pull request #2547 from IvanSavenko/instant_fadeout ... Make object fade-out / fade-in instant on instant movement speed	2023-08-12 11:23:26 +03:00
Michael	d0522b0fee	initial window	2023-08-12 02:41:48 +02:00
Michael	f0b60cf166	suggestions; use internally uppercase; fix; fullname	2023-08-11 23:56:20 +02:00
Michael	6ca5518ff1	Buxfix	2023-08-11 20:09:41 +02:00
nordsoft	70d04ad957	Replace thread approach with callback based	2023-08-11 20:04:14 +04:00
Ivan Savenko	20e10cd5ab	Fix potential access to empty std function on hero vs hero combat	2023-08-11 18:52:22 +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	9d7f46f985	Fix crash on right-clicking player flags in RMG UI	2023-08-11 18:50:39 +03:00
Ivan Savenko	631e93e846	Fix missing lock of player interface	2023-08-11 18:50:39 +03:00
SoundSSGood	213eda5e1e	altar sacrifice all fix	2023-08-11 14:19:06 +03:00
Ivan Savenko	8ba3f771be	Merge pull request #2529 from IvanSavenko/hero_defeat_fix ... Fix potential access to empty std function on hero vs hero combat	2023-08-11 11:37:12 +03:00
Ivan Savenko	78bb7230a4	Merge pull request #2512 from IvanSavenko/obstacles_priority_fix ... Fixed rendering priority of battlefield background obstacles	2023-08-11 11:36:44 +03:00
Michael	2d9bb34825	format	2023-08-11 01:49:10 +02:00
Michael	2b093b8850	case handling	2023-08-11 01:46:22 +02:00
Michael	092a0d72a1	whitespace format	2023-08-11 00:19:24 +02:00
Michael	c260ce5814	current folder in first line	2023-08-10 23:52:16 +02:00
Michael	48747eea9d	bigger line for folder	2023-08-10 23:37:19 +02:00
Michael	f24c636d17	code review suggestions	2023-08-10 22:15:32 +02:00
Ivan Savenko	e9fb0c9b8c	Make object fade-out / fade-in instant on instant movement speed	2023-08-10 13:02:34 +03:00
nordsoft	ef7008a753	Unblock UI while tutorial loading	2023-08-10 01:27:13 +04:00
Michael	92fd317a84	erase -> pop_back	2023-08-09 20:27:24 +02:00
nordsoft	f4869cbfb0	Tutorial load game mode	2023-08-09 15:29:48 +04:00
nordsoft	04c0124759	Remove unnecessary strings	2023-08-09 14:59:26 +04:00
nordsoft	1def98a862	Tutorial implemented	2023-08-09 03:54:09 +04:00
Michael	6013549ef8	no old selection	2023-08-09 00:41:13 +02:00
Michael	8693dab9ec	fix filter	2023-08-09 00:13:02 +02:00
Ivan Savenko	dc2135da7f	Fix potential access to empty std function on hero vs hero combat	2023-08-09 00:46:55 +03:00
Michael	bbe04c747d	Folder Icon, Save, Folder on top...	2023-08-08 23:46:30 +02:00
Ivan Savenko	45215f12f3	Merged master into beta	2023-08-08 20:43:47 +03:00
Ivan Savenko	d947c14495	Few more H3 data validation checks	2023-08-08 12:50:16 +03:00
Michael	855b94b316	fix	2023-08-08 02:30:28 +02:00
Michael	8b8006c0e0	bring it to work...	2023-08-08 02:04:06 +02:00
Michael	5e1f1294e5	rework	2023-08-08 00:38:13 +02:00
Ivan Savenko	ed066cb7ba	Fixed possible multithreading races in sound/music callbacks	2023-08-08 00:27:03 +03:00
Ivan Savenko	62a5eeebbc	Fixed rendering priority of battlefield background obstacles	2023-08-07 21:18:43 +03:00
Michael	e5627b4bb7	tests	2023-08-07 00:10:06 +02:00
Ivan Savenko	9bd27c50a0	Allowed loading saves from inside mods	2023-08-06 19:39:55 +03:00
Ivan Savenko	0b99fc0ccb	Show message box when H3 data is missing	2023-08-06 18:16:32 +03:00
Ivan Savenko	6ddac8376d	Fixed possible crash on attempt to load missing font(?)	2023-08-06 17:47:12 +03:00
Ivan Savenko	c524caee5c	Fixed possible uncaught exception on starting map	2023-08-06 17:46:49 +03:00
Ivan Savenko	0c9e2d6fdd	Workaround for crash on map rendering	2023-08-06 14:11:31 +03:00
Ivan Savenko	5faaf175f9	Added debug information to SDL-related crashes	2023-08-06 13:31:10 +03:00
Ivan Savenko	a4ff408c9d	Removed unused code	2023-08-06 13:29:57 +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	b9e804954d	Merge pull request #2462 from IvanSavenko/fix_assertion_failure ... (1.3.1) Fix assertion failure on screen resize	2023-08-05 23:50:27 +03:00
Ivan Savenko	c3d8607c8b	Merge pull request #2466 from IvanSavenko/battle_assertions_fix ... (1.3.1) Fix assertion failures in battle	2023-08-05 23:50:18 +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	00f3804604	Workaround for crash?	2023-08-05 13:39:08 +03:00
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Ivan Savenko	57d7dc97bf	Fix assertion failure on swiping during spellcast	2023-08-03 14:21:15 +03:00
Ivan Savenko	3213800097	Fix assertion failure on teleport cast	2023-08-03 14:20:54 +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	3f7e5fcfc3	Fix possible assertion failure on resolution change	2023-08-02 21:23:27 +03:00
Ivan Savenko	791eb1a37b	Added workaround for running game with outdated extras mod from 1.2	2023-08-01 14:47:17 +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	d9e7a8f88a	Merge pull request #2446 from IvanSavenko/bugfixing ... (1.3.0) Bugfixing	2023-07-31 16:21:43 +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	7f72f7a82c	Cleanup server connection code a bit	2023-07-30 20:15:32 +03:00
Ivan Savenko	593b82d178	Removed all references to boost::interprocess library	2023-07-30 20:14:57 +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	d86c0a969d	Fix conflicting market/town hotkeys	2023-07-30 12:34:34 +03:00
Ivan Savenko	a73146751c	Execute cursor changes in main thread on any platform	2023-07-30 12:30:56 +03:00
Michael	aaa115cf4b	Button-Sound -> haptic feedback	2023-07-29 00:11:16 +02:00
Ivan Savenko	6c52293dd9	Merge pull request #2425 from IvanSavenko/fix_combat_replay ... Attempt to fix combat replay queries	2023-07-29 00:03:44 +03:00
Ivan Savenko	4d08a131d3	Reorganization of boost filesystem usage ... - Removed (most of) boost filesystem namespace usings - Replaced boost::filesystem::fstream with std::fstream and different constructor that should be available on any plaftorm	2023-07-28 19:12:04 +03:00
Ivan Savenko	aed8c411fc	Minor rework & cleanup of combat replays	2023-07-27 19:25:55 +03:00
Dydzio	0b5cea0320	Use new adventure map state to detect opponent human turn	2023-07-27 17:26:52 +02:00
Dydzio	ff1a635e9e	Unblock basic adventure map actions (scrolling / right-click) in multiplayer	2023-07-26 21:20:11 +02:00
Ivan Savenko	ff2ae1d2d3	Merge pull request #2414 from IvanSavenko/fix_autocombat_crash ... Fix autocombat crash	2023-07-26 02:02:28 +03:00
Ivan Savenko	32f7a95e38	Use capture by value since thread might start after local method returns	2023-07-25 22:33:59 +03:00
Ivan Savenko	1335a834e2	Merge pull request #2408 from IvanSavenko/remove_log_warning ... Remove log warning	2023-07-25 18:15:52 +03:00
Ivan Savenko	eccd8590f5	Merge pull request #2406 from IvanSavenko/fix_mutex ... Fix game hang/crash on locking mutex	2023-07-25 18:15:37 +03:00
Ivan Savenko	705cdb846d	Merge pull request #2403 from IvanSavenko/error_detection_fix ... Attempt to fix & improve error reporting	2023-07-25 18:15:28 +03:00
Ivan Savenko	823080be86	Fix error on opening map list with hota maps	2023-07-24 23:27:26 +03:00
Ivan Savenko	f827571f9b	Fix assertion failure on exit due to mutex lock	2023-07-24 23:01:44 +03:00
Ivan Savenko	be3ed014a7	Merge pull request #2404 from dydzio0614/autosave-fix ... End turn autosave fix	2023-07-24 22:26:43 +03:00
DjWarmonger	9b3618b664	Merge pull request #2378 from vcmi/default_template_to_random ... Rename default map template to random map template	2023-07-24 19:16:02 +02:00
Dydzio	a4f9cde57d	Fix autosave at end of turn starting with AI turn on load	2023-07-24 18:24:57 +02:00
Ivan Savenko	21e794268b	Attempt to fix & improve error detection: ... - use std::fstream instead of boost::iostreams for properly working flush - removed some catch-all blocks - reduce catch scope of some try/catch blocks to clearly indicate intent	2023-07-24 18:48:56 +03:00
Tomasz Zieliński	d26e46ddfe	Remove old id, replace with randomTemplate	2023-07-24 17:39:32 +02:00
Tomasz Zieliński	6522cec969	Just the notes	2023-07-24 08:44:37 +02:00
Ivan Savenko	a280cc8845	Merge pull request #2384 from IvanSavenko/bugfixing_beta ... Bugfixing iteration	2023-07-24 00:49:34 +03:00
Ivan Savenko	558855b772	Merge pull request #2387 from Laserlicht/patch-3 ... allow clipboard paste	2023-07-24 00:49:19 +03:00
Ivan Savenko	8dd1545e25	Merge pull request #2390 from dydzio0614/hero-window-mana-fix ... Fix for hero info window mana points not getting spent on spellcast - option 1	2023-07-24 00:48:54 +03:00
Michael	ce00069dcd	haptic feedback on radial menu action	2023-07-23 15:17:30 +02:00
Ivan Savenko	639880a426	Fix handling of tactics by AI	2023-07-23 14:03:22 +03:00
Ivan Savenko	112a40a254	Fix pinch gesture on mobile?	2023-07-23 11:46:11 +03:00
Dydzio	47b6358e6e	Improve feature by triggering hero window refresh in response to netpack	2023-07-22 21:51:14 +02:00
Ivan Savenko	5be4f6ec2f	Fix visibility of creature amount label after casting spell before turn	2023-07-22 22:49:48 +03:00
Ivan Savenko	01d588ab54	Fix keyboard shortcuts on selection dialogs	2023-07-22 22:29:05 +03:00
Dydzio	05735a20e1	Fix for hero info window mana points not getting spent on spellcast	2023-07-22 15:32:00 +02:00
Michael	e8771e40a5	Update client/eventsSDL/InputSourceKeyboard.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-22 14:36:13 +02:00
Michael	746f8c5e62	added missing check for ctrl	2023-07-22 14:26:37 +02:00
Michael	59f3740aea	allow clipboard paste	2023-07-22 13:17:16 +02:00
Tomasz Zieliński	e8855e20c4	Merge remote-tracking branch 'origin/beta' into fix_rmg_teams	2023-07-22 12:16:14 +02:00
Ivan Savenko	a912770e29	Fix activation of radial menu on touchscreen	2023-07-22 12:33:05 +03:00
Ivan Savenko	e6d8b65e2c	Fix toggling of auto combat	2023-07-22 12:15:27 +03: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	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	692c40c0f3	Merge pull request #2364 from Laserlicht/map-select-popup ... Mapselection - popup	2023-07-21 15:44:18 +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
Michael	0f16cec3b9	whitespace	2023-07-20 22:05:09 +02:00
Michael	f313597968	Use boost::format	2023-07-20 22:02:39 +02:00
Michael	36e870ae45	Descriptions	2023-07-20 21:37:23 +02:00
Tomasz Zieliński	57bb011468	- Do not allow 0 or 1 teams ... - Do not allow player to set only 1 team in GUI	2023-07-20 20:34:00 +02:00
Michael	a86406d090	check list length	2023-07-20 02:20:54 +02:00
Michael	3484059a40	fix indentation	2023-07-20 02:01:00 +02:00
Michael	c28c0d2a13	Popup - Mapselection	2023-07-20 01:53:33 +02:00
Ivan Savenko	280085b95d	Merge pull request #2308 from IvanSavenko/remove_client_savegame ... Remove client savegames	2023-07-19 14:46:46 +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
Ivan Savenko	07a8c75bec	Merge pull request #2305 from dydzio0614/unlimited-autosave ... Ability to change autosave limit + set autosave prefix	2023-07-19 14:45:51 +03:00
Ivan Savenko	9e58f67ab5	Fix autocombat AI threading	2023-07-19 12:09:03 +03:00
Ivan Savenko	556763fb7b	Fixed handling of tactics	2023-07-18 22:02:35 +03:00
SoundSSGood	ca977d7105	backpack window slider	2023-07-18 21:01:55 +03:00
Ivan Savenko	79be1c66fb	Fix quick combat regression	2023-07-18 20:06:39 +03:00
Ivan Savenko	1bf6bbd9b6	Significantly simplified threading model in battles	2023-07-18 19:55:59 +03:00
Ivan Savenko	f27f5ebc7c	Split BattleAI::activeStack into several smaller methods	2023-07-18 17:35:19 +03:00
Ivan Savenko	5e8a778e7d	Attempt to fix / trace crashes from Google Play statistics	2023-07-18 17:31:21 +03:00
Ivan Savenko	c7d88271a9	Removed asynchronous calls from exchange window	2023-07-18 17:31:21 +03:00
Ivan Savenko	bb17cc13b1	Implemented lazy totalRedraw to prevent multiple redraws on single frame	2023-07-18 17:31:21 +03:00
Ivan Savenko	9168a1150f	Remove catch-all that only blocks debugging (and Google Play reports)	2023-07-18 17:31:21 +03:00
Ivan Savenko	7b06c41929	Merge pull request #2338 from dydzio0614/info-box-army-management ... Info box army management	2023-07-18 16:45:17 +03:00
Dydzio	f4f789804d	Update client/battle/BattleWindow.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-18 15:15:58 +02:00
Ivan Savenko	1e155c1ac7	Merge pull request #2355 from IvanSavenko/bugfixing ... Bugfixing iteration	2023-07-18 16:06:00 +03:00
Ivan Savenko	317183e00d	Merge branch 'develop' into info-box-army-management	2023-07-18 16:05:09 +03:00
Ivan Savenko	e0977693b0	Merge pull request #2336 from IvanSavenko/left_button_map_drag ... Left button map drag	2023-07-18 16:03:05 +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
Ivan Savenko	64a22d8590	Workaround for false double-clicking of elements in hero/town lists	2023-07-17 17:40:28 +03:00
Ivan Savenko	36efef0ee3	Do not play new day animation on game start	2023-07-17 16:30:12 +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	1b676933e5	Fix indent ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-07-16 15:46:43 +02:00
Dydzio	5882cbae78	Merge branch 'develop' into unlimited-autosave	2023-07-16 15:19:04 +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	f8fbafff2f	Fix github #2335 - town garrison not updating in info box	2023-07-16 10:18:43 +02:00
Dydzio	dbfcb5a749	Implement interactable town tooltip	2023-07-16 10:17:37 +02:00
Dydzio	013d4cd208	Fix slot deselect when selected shortly after new day animation bypass	2023-07-15 23:15:59 +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
Michael	4e242f98fd	Battleintro: Skip with mouse button	2023-07-15 21:18:04 +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	a4ba5a9b65	Merge pull request #2327 from IvanSavenko/bugfixing_from_stream ... Fix accumulated minor bugs	2023-07-15 21:55:19 +03:00
Dydzio	1711b3848f	Remove unused variable	2023-07-15 20:03:07 +02:00
Ivan Savenko	3c0037efca	Fix dismissing hero from opening hero window in town window that is ... opened in kindom overview window	2023-07-15 16:09:44 +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	189a0c6e0d	Re-center map on active object after screen resize	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	366239bf8d	Do not play movement sound on non-movement actions	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	c0f0c3cedd	Fix shortcuts not working sometimes	2023-07-15 16:09:44 +03:00
Ivan Savenko	0ec9af7d9b	Replaced WoG opening with H3:SoD files	2023-07-15 16:09:44 +03:00
Ivan Savenko	3836217da5	Fix updating of heroes when moving to/from garrison	2023-07-15 16:09:44 +03:00
Ivan Savenko	3e1125570d	Fix updating of hero & town lists on adventure map	2023-07-15 16:09:44 +03:00
Michael	bea6effcb7	haptic feedback only if menu opens ... fix	2023-07-14 22:49:44 +02:00
Michael	c6e860720e	haptic feedback only if menu opens	2023-07-14 22:47:13 +02:00
Dydzio	ad66acdd79	End turn autosave support + making it default	2023-07-13 22:07:42 +02:00
Dydzio	616916714a	Unrelated typo fix	2023-07-13 21:56:53 +02:00
Dydzio	404ab23bc6	Get autosave day without leading 0, delete ancient saveprefix stuff	2023-07-13 21:55:51 +02:00
Dydzio	bcb061b58f	Merge branch 'develop' into unlimited-autosave	2023-07-13 20:53:10 +02: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	fb00bf4067	Merge pull request #2322 from dydzio0614/resolution-fix ... Fix for fullscreen game always starting in native resolution	2023-07-13 12:57:32 +03:00
Ivan Savenko	c2845d120b	Merge pull request #2324 from mikeiit/develop ... Fixed selection update in saving screen	2023-07-13 12:57: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
Mike	3c707d8e31	Cleanup	2023-07-11 23:12:59 -07:00
Mike	5134583111	Added missing redraw after selection update	2023-07-11 23:10:02 -07:00
Mike	90397a9604	Merge remote-tracking branch 'upstream/develop' into develop	2023-07-11 19:06:21 -07:00
Dydzio	42db24b4b2	Fix for fullscreen game always starting in native resolution	2023-07-11 17:59:22 +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	78415c573b	Merge pull request #2289 from IvanSavenko/resolution_fixes ... Fix issues with changing game resolution	2023-07-11 14:35:07 +03:00
DjWarmonger	f6cc61e0be	Merge pull request #2297 from vcmi/rmg_roads ... Rmg roads	2023-07-11 09:25:24 +02:00
Ivan Savenko	d99fab8496	Reduce usage of getCursorPosition	2023-07-09 18:09:22 +03:00
Ivan Savenko	0deeff30b9	replaced clickPressed with clickReleased where applicable to H3	2023-07-09 17:55:39 +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	8750aa2c5b	Merged server savegame and (broken and unused) client savegame files	2023-07-09 15:30:47 +03:00
Mike	b327f890f2	Partially fixed initial loading of save file ... Brought back the missing save file info in the info card. Still need to fix the input text box and selection highlight.	2023-07-08 23:00:48 -07:00
Dydzio	fbf0bf78d6	Configurable autosave limit and prefix - ingame handling	2023-07-08 23:04:01 +02:00
Michael	d911756827	changes from code review	2023-07-08 21:02:03 +02:00
Michael	70b7f992de	fix	2023-07-08 20:34:11 +02:00
Michael	06541211d5	Rename var	2023-07-08 19:11:26 +02:00
Michael	050a22c257	only pop up for now	2023-07-08 18:50:59 +02:00
Michael	ff51b8f46b	Setting for haptic feedback	2023-07-08 18:47:38 +02:00
Michael	da8bcdd2dd	ios Support	2023-07-08 18:15:36 +02:00
Michael	a5fe6cc80b	hapticFeedback	2023-07-08 17:02:44 +02:00
Ivan Savenko	ca889a5c2a	Replaced clickLeft with clickPressed clickReleased methods	2023-07-08 14:33:04 +03:00
Tomasz Zieliński	730b36612c	Respect GUI settings for roads. By default, all road types are enabled.	2023-07-08 08:44:10 +02:00
Ivan Savenko	2a634b2ec0	Fixed UI updates on switching to/from fullscreen	2023-07-07 15:26:42 +03:00
Ivan Savenko	7e00a702c1	Fix switching to exclusive fullscreen to borderless windowed	2023-07-07 14:29:03 +03:00
Ivan Savenko	0c83e34093	Implemented reserved area for iOS notch / cutout	2023-07-07 14:29:03 +03:00
Ivan Savenko	5143ca266d	Moved SDL renderer access to ScreenHandler class	2023-07-07 14:29:03 +03:00
Ivan Savenko	fa4a0004b2	Merge pull request #2291 from IvanSavenko/terrain_animations_config ... Moved hardcoded terrain palette-cycling animations to config	2023-07-07 14:28:39 +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
Ivan Savenko	a9d25b0109	Fix map grid visibility on game load	2023-07-07 01:27:57 +03:00
Ivan Savenko	41755c9d87	Fix slider scroll via UI buttons	2023-07-07 01:23:17 +03:00
Mike	6414e3b3fc	Changed resource cost value label position	2023-07-05 18:43:52 -07:00
Ivan Savenko	3bce245780	Moved hardcoded terrain palette-cycling animations to config	2023-07-05 22:07:20 +03:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
Ivan Savenko	85655d5534	Block map level toggle on maps without underground	2023-07-04 21:42:37 +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	07d9674828	Mouse click that activates a window will also trigger mouse event	2023-07-04 20:28:02 +03:00
Ivan Savenko	1dff721747	Fix infobox resetting to current hero during enemy turn	2023-07-04 20:28:02 +03:00
Ivan Savenko	1cbc6457ce	Fix possible assertion failure on removing non-owned town	2023-07-04 20:28:02 +03:00
Ivan Savenko	4fd5a2b3ea	Fixed sorting maps breaking after multiple clicks in succession	2023-07-04 20:28:00 +03:00
Ivan Savenko	f914ec9d57	Fix activation of in-game console in other windows	2023-07-04 20:27:45 +03:00
Ivan Savenko	900b1c1763	Simplified text input handling, fixes hotkeys on windows with text input	2023-07-04 18:42:52 +03:00
Ivan Savenko	81b9aec527	Fix map edge scrolling after swiping usage	2023-07-03 23:50:09 +03:00
SoundSSGood	fd9c7352a0	suggested changes	2023-07-03 22:54:03 +03:00
Ivan Savenko	4e80356bea	Do not hide minimap on human player turn	2023-07-03 19:36:10 +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	48eb8ab54f	Play sound when receiving message, not just on sending ours	2023-07-03 17:12:31 +03:00
Ivan Savenko	aacef72125	Attempt to remove native pinch handling from ios	2023-07-03 17:00:03 +03:00
Ivan Savenko	8efa7911b7	Implemented "Allied Adventure Map AI" option	2023-07-03 14:34:53 +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	cdc27d1fcf	Play correct music file in campaign menu	2023-06-27 20:09:11 +03:00
Ivan Savenko	0fdbf54937	Use HeroTypeID instead of int	2023-06-27 19:32:27 +03:00
Ivan Savenko	96eab03b16	Fix UI updates	2023-06-27 14:09:04 +03:00
Ivan Savenko	88566cb1ef	Fix another unprotected UI access	2023-06-26 22:14:21 +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	e2bd98e21e	CampaignRegions class encapsulation	2023-06-26 17:15:59 +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