5080 Commits

Author	SHA1	Message	Date
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	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
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	f6843c0574	fix focus problem	2023-10-16 01:39:53 +02:00
Nordsoft91	ee997a291c	Merge pull request #3045 from Laserlicht/interface_improvement ... various interface shortcuts	2023-10-15 23:48:22 +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	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 43636af2e475a2b8d3ae0ee6eeacedc2cc2e290e, reversing changes made to aed2e360ba3235632158b9adc7eb5638c05b4e84. # 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