4826 Commits

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