5170 Commits

Author	SHA1	Message	Date
Laserlicht	5ae646bd15	Update client/windows/GUIClasses.cpp ... Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-10-15 12:19:44 +02:00
Laserlicht	23e1b0b0d5	radial wheel for hero	2023-10-15 02:43:42 +02:00
Laserlicht	78026f40eb	name opens town itself	2023-10-15 00:41:17 +02:00
Laserlicht	f6071ed181	fix	2023-10-15 00:09:32 +02:00
Laserlicht	c96cc405ed	town now updates	2023-10-14 23:41:12 +02:00
nordsoft	c8452355ce	Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-connection" ... This reverts commit 43636af2e4, reversing changes made to aed2e360ba. # Conflicts: # client/CServerHandler.cpp	2023-10-14 22:52:24 +02:00
Nordsoft91	aa25ab6488	Merge pull request #3035 from Nordsoft91/quests ... Quests rework	2023-10-14 21:38:15 +02:00
Laserlicht	b2396a61fa	code review	2023-10-14 13:34:39 +02:00
Laserlicht	7217992898	code review	2023-10-14 12:08:38 +02:00
Laserlicht	b89cdda718	Tavern also in infobox & haptics	2023-10-13 23:36:51 +02:00
Laserlicht	0c6b1ca3c8	possibility to change name	2023-10-13 23:04:35 +02:00
Laserlicht	5a84e7cd7f	Update client/windows/GUIClasses.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-13 19:56:56 +02:00
Laserlicht	08832eeeb4	fix	2023-10-13 19:56:56 +02:00
Laserlicht	3c117da4eb	fix tavern	2023-10-13 19:56:56 +02:00
Laserlicht	9e508fe2c2	interface improvements	2023-10-13 19:56:56 +02:00
Nordsoft91	802e1bb961	Merge pull request #3042 from Laserlicht/crash_preview ... [fix] crash with custom campaign preview	2023-10-13 10:57:02 +02:00
Nordsoft91	093c8149e5	Merge pull request #3040 from Laserlicht/infobox_next	2023-10-13 10:38:32 +02:00
Nordsoft91	ab36692847	Merge pull request #3037 from Laserlicht/missing_res	2023-10-13 10:36:33 +02:00
nordsoft	fadf086e61	Fix review comments	2023-10-12 13:30:01 +02:00
Nordsoft91	4ae123e2a1	Merge pull request #3038 from Alexander-Wilms/connection-error-window ... Show info dialog when connection to multiplayer server fails	2023-10-12 00:16:04 +02:00
nordsoft	7ccd4cdcb2	Refactor quests progress	2023-10-11 21:10:42 +02:00
Nordsoft91	ecd01fd53c	Merge pull request #3039 from Laserlicht/townhall_click	2023-10-11 18:43:59 +02:00
Laserlicht	abab917ef9	fix crash with custom campaign preview	2023-10-11 11:23:38 +02:00
Laserlicht	f9db3d131f	lastActivated with overload	2023-10-10 23:51:05 +02:00
nordsoft	bb238f9b72	New quests work	2023-10-10 23:44:29 +02:00
Nordsoft91	773fb965ba	Merge pull request #3028 from Nordsoft91/fixes ... Fix campaign advance crash	2023-10-10 23:41:52 +02:00
Nordsoft91	25952f8223	Merge pull request #3027 from Nordsoft91/turn-timer ... Add game pause	2023-10-10 23:41:36 +02:00
Laserlicht	8a3e58cd5e	red is the most liked color	2023-10-10 23:15:40 +02:00
Laserlicht	53ee843e7e	fixes problem with radial menu	2023-10-10 22:33:22 +02:00
Laserlicht	890c4ac19d	quick army managment click next	2023-10-10 22:11:06 +02:00
Laserlicht	926bf71814	make townhall clickable	2023-10-10 21:02:40 +02:00
Alexander Wilms	7c627d8163	Show info dialog when connection to multiplayer server fails	2023-10-10 18:11:11 +02:00
Ivan Savenko	e247c29269	Merge pull request #3021 from Laserlicht/video ... video loop fix and missing videos/sounds for battle result	2023-10-10 18:48:19 +03:00
Nordsoft91	b6da60b105	Merge pull request #3023 from Laserlicht/video_audio ... audio from SMK video file	2023-10-10 00:40:33 +02:00
Laserlicht	25f7bb40d0	new layout	2023-10-09 22:50:07 +02:00
Laserlicht	19788c6399	suggestion	2023-10-09 22:22:10 +02:00
Laserlicht	fa9d5e9971	show missing resources	2023-10-09 21:43:43 +02:00
Laserlicht	7ef9e91741	new approach	2023-10-08 21:19:04 +02:00
Laserlicht	89a39fcfc0	code review	2023-10-08 20:27:56 +02:00
nordsoft	fe7c01cd37	Fix 3024	2023-10-08 17:46:47 +02:00
Nordsoft91	43636af2e4	Merge pull request #2959 from Alexander-Wilms/faster-server-connection ... Sleep for 10 ms instead of 1000 ms while waiting for server connection	2023-10-08 17:21:57 +02:00
Nordsoft91	aed2e360ba	Merge pull request #2997 from Alexander-Wilms/fix-ios-pch ... Enable ccache for iOS and MSVC builds	2023-10-08 16:10:07 +02:00
nordsoft	d7d435dcb7	Add game pause	2023-10-08 16:03:57 +02:00
Laserlicht	a1f6e49f87	vcmi always uses only 2 channels	2023-10-08 14:09:07 +02:00
Laserlicht	639b6c6577	version	2023-10-08 12:49:59 +02:00
Laserlicht	66ff603456	remove crackle	2023-10-08 12:49:59 +02:00
Laserlicht	39e06ea5e1	fix error message	2023-10-08 12:49:59 +02:00
Laserlicht	3c647334b0	remove other pr	2023-10-08 12:49:59 +02:00
Laserlicht	be2b3afe48	implements sounds	2023-10-08 12:49:59 +02:00
Laserlicht	2bbce0f38b	decoding working	2023-10-08 12:49:59 +02:00
Laserlicht	8de4b88a1b	basically playing	2023-10-08 12:49:59 +02:00
Laserlicht	628de69a63	audio	2023-10-08 12:49:59 +02:00
Laserlicht	63fbaa8380	support raw audio	2023-10-08 12:49:59 +02:00
Nordsoft91	088ce9b948	Merge pull request #3013 from Nordsoft91/turn-timer	2023-10-08 12:11:44 +02:00
Laserlicht	42bf5fdd58	video fix	2023-10-07 14:31:49 +02:00
Alexander Wilms	732c39fcc6	Fix build	2023-10-07 00:08:22 +02:00
Alexander Wilms	c8f1512a3f	Use correct address to decide whether we're connecting to a remote server or a local one	2023-10-06 23:33:51 +02:00
nordsoft	9b54b25a6c	Show timer only for one player	2023-10-06 18:17:05 +02:00
nordsoft	a09c595cf4	Support simturn timers	2023-10-06 18:17:05 +02:00
nordsoft	043f54698b	Fix translations in map editor / fix crash on game end	2023-10-05 23:34:29 +02:00
Ivan Savenko	b75a67ef7c	Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor ... Improvements to type safety of Identifier class	2023-10-05 00:33:07 +03:00
Ivan Savenko	179def179f	Merge pull request #2969 from IvanSavenko/tavern_query ... Add query for Tavern, Dwelling and Market visits	2023-10-04 22:34:45 +03:00
Ivan Savenko	56d5c74a61	Merge pull request #2996 from Nordsoft91/fix-2992 ... Capture key event in chat box	2023-10-04 19:59:06 +03:00
Ivan Savenko	037efdf5fc	Improvements to type safety of Identifier class ... - Constructor of Identifier from integer is now explicit - Lobby hero/town selection now uses Identifiers instead of int's - Removed serialization workaround for hero portraits - Added dummy objects for custom heroes portraits for ID resolver to use - HeroInstance now stores portrait ID only in case of custom portrait - Fixed loading of campaign heroes portraits on RoE maps	2023-10-04 18:05:23 +03:00
Ivan Savenko	39a92cdde3	Add query for dwellings dialog	2023-10-04 17:47:12 +03:00
Ivan Savenko	898733eed7	Added Query to track visit duration for Taverns and Markets	2023-10-04 17:47:12 +03:00
Ivan Savenko	e322d0a084	Merge pull request #2966 from IvanSavenko/simplify_ui_lock ... Simplified locking of game UI state	2023-10-04 16:50:23 +03:00
Alexander Wilms	b58cca7770	100 connection attempts is not always enough	2023-10-03 22:06:32 +02:00
Alexander Wilms	a66d8ecb8f	Use ui16 instead of uint for connectionAttemptCount to fix MinGW build	2023-10-03 22:06:32 +02:00
Alexander Wilms	e1401d26c5	hostAddress can be localhost, return from justConnectToServer() is maximum number of attempts is exceeded	2023-10-03 22:06:32 +02:00
Alexander Wilms	39427d6658	Use different delay and maximum number of connection attempts for local and remote servers	2023-10-03 22:06:32 +02:00
Alexander Wilms	9f9930a9dd	CServerHandler::justConnectToServer(): Read settings only once	2023-10-03 22:06:32 +02:00
Alexander Wilms	614d000376	Sleep for 10 ms instead of 1000 ms while waiting for server connection	2023-10-03 22:06:32 +02:00
Laserlicht	ec8580b99e	Merge branch 'develop' into patch-4map_overview_rework	2023-10-02 21:03:16 +02:00
Nordsoft91	4620d2c96d	Merge pull request #2980 from Nordsoft91/proxy-reconnect ... Allow to reconnect to proxy server	2023-10-02 20:42:11 +02:00
Nordsoft91	c57d5545c2	Merge pull request #2971 from Nordsoft91/translations ... Multi-language support for network game and for VMAPs	2023-10-02 20:41:42 +02:00
Laserlicht	12ca3ea0ec	pos from texture	2023-10-01 19:44:04 +02:00
Alexander Wilms	46d785c371	Fix iOS build with ENABLE_PCH=OFF ... https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891 Fixes #2991	2023-10-01 18:16:41 +02:00
Laserlicht	cbd014ac88	code review	2023-10-01 17:35:56 +02:00
Ivan Savenko	b21a361b99	Merge pull request #2814 from SoundSSGood/arts-counter-impovements ... Artifacts counter impovements	2023-10-01 17:53:51 +03:00
nordsoft	213d0c3553	Capture events in chat box	2023-10-01 16:40:26 +02:00
Nordsoft91	d695d87b99	Merge pull request #2964 from kambala-decapitator/fix-docs ... improve layout of developer docs	2023-10-01 14:08:38 +02:00
Nordsoft91	041ffceb07	Merge pull request #2952 from Alexander-Wilms/develop ... Enable VSync to prevent screen tearing while scrolling across map	2023-10-01 14:08:00 +02:00
Laserlicht	23b8a321f6	file ending	2023-10-01 00:46:29 +02:00
Laserlicht	648a37310f	description	2023-10-01 00:35:11 +02:00
Laserlicht	65c21064b5	added var	2023-10-01 00:18:25 +02:00
Laserlicht	58dfc55ca3	only calc minimaps once	2023-09-30 23:50:27 +02:00
Laserlicht	61aae7bccc	code review	2023-09-30 22:49:22 +02:00
Laserlicht	73a05d82e1	fix	2023-09-30 20:18:12 +02:00
Laserlicht	8b835c9253	load game support	2023-09-30 20:03:33 +02:00
Laserlicht	c6adcc40f5	add date; cleanup	2023-09-30 17:56:51 +02:00
Laserlicht	79e66c38df	layout	2023-09-30 17:14:22 +02:00
Laserlicht	718bafc8af	map overview rework	2023-09-30 15:05:12 +02:00
nordsoft	f3fa0f8652	Allow to reconnect to proxy server	2023-09-29 19:49:18 +02:00
Laserlicht	293214bb61	height fix	2023-09-29 00:08:25 +02:00
Ivan Savenko	9ba1aa652d	Merge pull request #2967 from IvanSavenko/bugfixing ... Miscellaneous bugfixing	2023-09-28 12:11:51 +03:00
nordsoft	6da605ff83	Campaign meta strings	2023-09-28 00:10:28 +02:00
nordsoft	5b97c323d3	Rename hero strings to text id	2023-09-28 00:04:05 +02:00
nordsoft	0ac893b80f	Rumors meta string	2023-09-27 23:22:45 +02:00
nordsoft	03c099d4fd	First steps	2023-09-27 22:53:13 +02:00
Ivan Savenko	71ad9d6707	Fix crash on starting map as non-red player	2023-09-27 21:23:54 +03:00
Ivan Savenko	03a939fd52	Remove redundant thread name - this method is not thread entry point	2023-09-27 19:13:26 +03:00
Ivan Savenko	195320dcf2	Removed remaining references to 'pim' name	2023-09-27 18:50:01 +03:00
Ivan Savenko	0dcfd6e65c	Removed optional locking in waitWhileDialog method	2023-09-27 18:44:08 +03:00
Ivan Savenko	d6b9fa8fbd	Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock ... - Removed CPlayerInterface::pim since this lock does not actually protects LOCPLINT but rather entire game UI state - added more logical CGuiHandler::interfaceLock - interface lock is now non-recursive and is locked only once by initial caller that want to access GUI	2023-09-27 18:33:52 +03:00
Ivan Savenko	c330998518	Fix freeze on moving through teleporters without set path	2023-09-27 17:17:06 +03:00
Alexander Wilms	f52562eeb7	Fix freezing of hero and long enemy turns without sleeping in FramerateManager::framerateDelay()	2023-09-27 16:09:52 +02:00
Ivan Savenko	97097c20ad	Merge pull request #2874 from SoundSSGood/exchange-window-update ... Exchange window update	2023-09-27 15:50:52 +03:00
Ivan Savenko	71a1ed816a	Merge pull request #2892 from Laserlicht/highscore_menu ... Highscore Menu & end video	2023-09-27 15:48:47 +03:00
Ivan Savenko	efe3393408	Merge pull request #2947 from Laserlicht/enableUiEnhancements_button ... enableUiEnhancements button	2023-09-27 15:47:25 +03:00
Ivan Savenko	94dbde05a0	Merge pull request #2868 from IvanSavenko/simultaneous_turns ... Simultaneous turns	2023-09-27 15:45:02 +03:00
Ivan Savenko	d0046d29f2	Merge pull request #2957 from ProjectMutilation/fix-pvs-issues ... Fixed some issues found by pvs	2023-09-27 15:40:37 +03:00
Ivan Savenko	9147fd49ab	Merge pull request #2932 from Laserlicht/mainmenu_layer ... fix layer problem in mainmenu	2023-09-27 15:37:40 +03:00
Andrey Filipenkov	764fbebb35	make script executable	2023-09-27 15:12:50 +03:00
Maxim Korotkov	59acf639da	client: render: fixed copy-past errror in genFromJson() ... Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>	2023-09-27 09:05:58 +03:00
Alexander Wilms	0d11c5197d	Remove superfluous vsyncEnabled attribute	2023-09-26 23:48:53 +02:00
Alexander Wilms	ecc7648ef8	Use display index from settings	2023-09-26 23:05:48 +02:00
Alexander Wilms	e2eeec96a9	Fix stuttering animations when using high frame rate limit or vsync	2023-09-26 22:53:45 +02:00
Laserlicht	242e0ffa4a	fix playername	2023-09-26 22:06:04 +02:00
Laserlicht	2738dc3190	better approach for redrawing	2023-09-26 21:12:04 +02:00
Nordsoft91	8c6381b497	Merge pull request #2951 from Laserlicht/spell_icon ... specific spell icon (artifacts)	2023-09-26 20:13:19 +02:00
Nordsoft91	12eac2d4ba	Merge pull request #2941 from Laserlicht/spellbook ... Big Spellbook	2023-09-26 20:12:30 +02:00
Nordsoft91	c803b57c33	Merge pull request #2889 from Nordsoft91/mod-compatibility-check ... Proper mod compatibility check logic	2023-09-26 19:29:46 +02:00
Alexander Wilms	bfa5ef7990	Don't sleep in FramerateManager::framerateDelay() if VSync is enabled	2023-09-26 18:55:25 +02:00
Alexander Wilms	23d1638d70	Add VSync to settings	2023-09-26 18:55:25 +02:00
Alexander Wilms	73ea52c615	Enable VSync to prevent screen tearing while scrolling across map ... Fixes #2935	2023-09-26 18:55:25 +02:00
Ivan Savenko	42030ed10f	Fix hotseat	2023-09-26 17:28:50 +03:00
Laserlicht	ac5f552219	fix	2023-09-26 15:56:39 +02:00
Laserlicht	93e2826e3e	new constructor	2023-09-26 15:53:44 +02:00
nordsoft	056cba55a8	Show loading screen immediately on restart	2023-09-26 15:45:46 +02:00
Ivan Savenko	49c148502b	Correctly close dialogs on end of turn	2023-09-26 15:54:24 +03:00
Ivan Savenko	54adeef29f	Added temporary UI for simturns testing	2023-09-26 13:42:20 +03:00
Ivan Savenko	5b21a5ffbc	Simturn duration is now part of StartInfo	2023-09-26 13:42:20 +03:00
Ivan Savenko	d257fb37f0	Use optional instead of Json for queries	2023-09-26 13:42:20 +03:00
Ivan Savenko	56074e18a9	Block turn end button after player ends turn	2023-09-26 13:42:20 +03:00
Ivan Savenko	64c82c9133	Fixed UI locking in simturns	2023-09-26 13:42:20 +03:00
Laserlicht	ab55615359	remove double code	2023-09-26 10:28:10 +02:00
Laserlicht	6b5f6030e2	header	2023-09-25 23:02:16 +02:00
Laserlicht	096036dc9f	spell icon	2023-09-25 22:58:59 +02:00
Laserlicht	c3373ea34c	code review	2023-09-25 18:06:40 +02:00
Laserlicht	7cf654992f	code review	2023-09-25 16:34:36 +02:00
Laserlicht	5061792cce	enableUiEnhancements button	2023-09-25 13:11:08 +02:00
Laserlicht	28f4046937	ready	2023-09-25 01:04:06 +02:00
Laserlicht	3e4a5b7d80	border and variable	2023-09-25 00:31:32 +02:00
Laserlicht	a6b68be2df	offsets	2023-09-24 23:50:50 +02:00
Laserlicht	8b5c9db21b	basic offset	2023-09-24 23:15:09 +02:00
Laserlicht	240d291de9	big spellbook	2023-09-24 22:24:51 +02:00
Laserlicht	72e4941982	dimlevel as class variable	2023-09-24 12:08:27 +02:00
Laserlicht	68e536c290	code review	2023-09-24 02:00:42 +02:00
Laserlicht	b143c2786f	use dimming to hide screen	2023-09-24 00:58:48 +02:00