5154 Commits

Author	SHA1	Message	Date
Laserlicht	0eba0ee686	show random maps	2023-10-21 02:12:34 +02:00
Nordsoft91	f3acc939b9	Merge pull request #3062 from Laserlicht/sort_towns ... sort town/hero feature	2023-10-20 22:51:26 +02:00
Nordsoft91	12b179ef1f	Merge pull request #3057 from Laserlicht/rw_hero	2023-10-20 01:42:06 +02:00
SoundSSGood	068a7d5d4a	crash fixed	2023-10-20 01:11:10 +03:00
Johannes Schauer Marin Rodrigues	a1a5bc28c2	convert line endings from CRLF (Windows) to LF (Linux/Unix) ... Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073	2023-10-19 16:23:21 +02:00
Ivan Savenko	e0f6b582f5	Display object description only on right-click	2023-10-19 14:36:11 +03:00
Ivan Savenko	0f2922d064	Only show components if UI enhancements is on	2023-10-19 13:33:49 +03:00
Ivan Savenko	d295840c64	Merge pull request #3075 from josch/spelling ... some spelling fixes	2023-10-19 11:15:25 +03:00
Johannes Schauer Marin Rodrigues	f9e1b302c7	some spelling fixes	2023-10-18 01:41:02 +02:00
Alexandre Detiste	15e45f966c	typos found by lintian	2023-10-17 22:06:08 +02:00
Laserlicht	2fcbf78e4e	unused var	2023-10-17 21:22:27 +02:00
Laserlicht	464c65a595	fix	2023-10-17 21:17:57 +02:00
Laserlicht	e05102192b	heroes and more buttons	2023-10-17 21:13:08 +02:00
Laserlicht	464577be28	new icons	2023-10-17 20:06:35 +02:00
Ivan Savenko	927ce4e60e	Improvements to rewardable objects popups	2023-10-16 23:55:37 +03:00
Nordsoft91	1ffc246c8b	Merge pull request #3051 from Laserlicht/name_change ... possibility to change name in lobby	2023-10-16 22:28:31 +02:00
Laserlicht	be6ed36422	fix	2023-10-16 21:35:29 +02:00
Laserlicht	ecd093cae4	fix	2023-10-16 21:28:44 +02:00
Laserlicht	0a1578b797	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-16 21:24:59 +02:00
Laserlicht	d5b16ac96c	rename	2023-10-16 01:43:50 +02:00
Laserlicht	f3262a47c0	Update client/adventureMap/CList.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2023-10-16 01:42:01 +02:00
Laserlicht	f6843c0574	fix focus problem	2023-10-16 01:39:53 +02:00
Laserlicht	aeb559efb8	code review	2023-10-16 00:04:29 +02:00
Nordsoft91	ee997a291c	Merge pull request #3045 from Laserlicht/interface_improvement ... various interface shortcuts	2023-10-15 23:48:22 +02:00
Ivan Savenko	dd841bdaa7	Use enum instead of mix of bool's and int's for tile reveal	2023-10-16 00:12:38 +03:00
Ivan Savenko	98fd939ed6	Cartographer/Observatory is now configurable object	2023-10-16 00:12:38 +03:00
Laserlicht	4528f42cdf	fix segmentation fault; update townlist on adventuremap	2023-10-15 15:53:19 +02:00
Laserlicht	3b853bff08	sort town feature	2023-10-15 14:31:33 +02:00
Laserlicht	efcf6b71d7	formatting	2023-10-15 12:58:07 +02:00
Laserlicht	dd0033296f	docs	2023-10-15 12:28:13 +02:00
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