4830 Commits

Author	SHA1	Message	Date
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