269 Commits

Author	SHA1	Message	Date
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Ivan Savenko	a09147a433	Do not block map layer toggles in world view mode	2023-09-12 21:15:14 +03:00
Nordsoft91	0a799ecc46	Merge pull request #2740 from Laserlicht/fix_cursor_issue	2023-09-11 22:20:11 +02:00
Laserlicht	2cb28178ae	code review	2023-09-10 20:52:35 +02: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	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	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
Michael	20fd0d8901	fix cursor issue	2023-09-02 18:35:32 +02:00
Ivan Savenko	cab2bddf7e	Merge pull request #2712 from Laserlicht/dim_map ... Dim adventuremap	2023-09-01 22:37:10 +03: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
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
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
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	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
Nordsoft91	1586c6c6a0	Merge pull request #2668 from IvanSavenko/remove_current_player ... Remove "currentPlayer" from gamestate	2023-08-28 17:10:28 +04:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03: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	e54287ea5d	Converted remaining identifier to new system	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	ec8d31bbfc	First step at unifying game identifiers code	2023-08-25 13:38:01 +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	142889e3a5	Give all threads created by client human-readable name for debug	2023-08-23 16:32:29 +03: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	a09cb23a85	Better handling other players for turn timer	2023-08-20 04:06:52 +04:00
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
nordsoft	2fff74deea	Remove uninitialized variable	2023-08-19 18:59:31 +04:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Ivan Savenko	ec0a51bd5c	Fixed border scrolling when game window is maximized	2023-08-17 12:25:02 +03:00
nordsoft	647c7c15a3	Add sound notification for timer	2023-08-17 01:10:03 +04:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
nordsoft	f01973a4f0	Configurable turn timer	2023-08-14 01:13:37 +04:00
nordsoft	093e226bff	Fix compilation	2023-08-13 23:50:40 +04:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +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