12476 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael	080630b39f	try to fix	2023-08-20 22:22:46 +02:00
Nordsoft91	2f5bd1423c	Merge pull request #2623 from Nordsoft91/tutorial	2023-08-20 23:20:27 +04:00
Michael	5c5576313b	handle long texts better; big window also for only one layer	2023-08-20 16:58:13 +02:00
nordsoft	989a0859ef	Fix tutorial loading	2023-08-20 17:58:40 +04:00
Nordsoft91	ef4fddd0c4	Merge pull request #2570 from Laserlicht/town_selection_window ... Town selection window	2023-08-20 17:37:45 +04:00
Michael	952ce3061b	avoid crash if any error in map	2023-08-20 14:28:10 +02:00
Michael	e3a4c65100	code review	2023-08-20 14:14:47 +02:00
Michael	1d94536299	code review	2023-08-20 13:16:39 +02:00
Michael	52ed824100	add sound; possibility to click outside to close	2023-08-20 13:05:25 +02:00
nordsoft	a09cb23a85	Better handling other players for turn timer	2023-08-20 04:06:52 +04:00
Nordsoft91	e283a80146	Merge pull request #2584 from krs0/feature/Remove_wog_artifacts_from_SoD ... Removed WoG artifacts from core. Replaced with unused to avoid crashes.	2023-08-20 03:32:49 +04:00
nordsoft	314a17cdd9	Paint timer color into player color	2023-08-19 19:45:25 +04:00
nordsoft	d4ab3087cb	Disable timer for AI players	2023-08-19 19:00:08 +04:00
nordsoft	2fff74deea	Remove uninitialized variable	2023-08-19 18:59:31 +04:00
Nordsoft91	4a6deedd5e	Merge pull request #2530 from Nordsoft91/tutorial ... Support tutorial	2023-08-19 18:06:15 +04:00
Ivan Savenko	801c051625	Merge pull request #2613 from vcmi/IvanSavenko-patch-1 ... Fix merge	2023-08-18 15:20:08 +03:00
Ivan Savenko	4c503f8df3	Fix merge	2023-08-18 15:13:38 +03:00
Ivan Savenko	d0b3319f6a	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-18 15:08:23 +03:00
Ivan Savenko	f4c20bc33f	Merge pull request #2612 from vcmi/DjWarmonger-patch-2 ... Update README.md	2023-08-18 13:37:26 +03:00
DjWarmonger	e25c070f59	Update README.md ... - Add counter for 1.3.1 - Remove abandoned Coverity status	2023-08-18 12:22:01 +02:00
Ivan Savenko	83b00bb7c3	Merge pull request #2610 from vcmi/master ... Merge master -> beta	2023-08-18 12:56:05 +03:00
DjWarmonger	f9564dc8e4	Merge pull request #2563 from vcmi/fix_resources_near_mines ... Fix resources placed behind mines	2023-08-18 09:12:56 +02:00
Michael	8635c24166	fix	2023-08-18 00:15:47 +02:00
Michael	f9fa27b180	fix	2023-08-17 23:40:19 +02:00
Michael	e44f713f01	side by side map; player colors	2023-08-17 23:09:20 +02:00
Michael	af347242b4	fix compile error	2023-08-17 20:34:31 +02:00
Michael	ac64b9f2b5	fix	2023-08-17 18:52:00 +02:00
Michael	077ec65bf6	simplify	2023-08-17 18:15:42 +02:00
Michael	e61dc2ec23	constants	2023-08-17 17:54:53 +02:00
Michael	e1e16018d1	code review first batch	2023-08-17 17:29:31 +02:00
Ivan Savenko	daa8a494fc	Merge branch 'release_131' into master	2023-08-17 16:19:20 +03:00
Ivan Savenko	ec0a51bd5c	Fixed border scrolling when game window is maximized	2023-08-17 12:25:02 +03:00
Michael	edc11fd451	Map preview initial draft	2023-08-17 09:56:50 +02:00
Ivan Savenko	8b8d2b8810	Updated changelog	2023-08-17 10:26:01 +03:00
Ivan Savenko	6e7b7932a0	Fixed recruitment of hero from towns located on map border	2023-08-17 10:26:01 +03:00
Ivan Savenko	bfa12080ac	Added downloads counter for 1.3.1	2023-08-17 10:26:01 +03:00
Ivan Savenko	074fd42d84	Added missing includes	2023-08-17 10:26:01 +03:00
Ivan Savenko	9509974a5d	Updated changelog	2023-08-17 10:26:01 +03:00
Nordsoft91	96e820ddac	Merge pull request #2517 from Laserlicht/folders	2023-08-17 10:09:37 +04:00
nordsoft	647c7c15a3	Add sound notification for timer	2023-08-17 01:10:03 +04:00
Michael	71bcc611f5	review	2023-08-15 20:19:13 +02:00
Ivan Savenko	198556409c	Merge pull request #2593 from IvanSavenko/hotfix ... Final crashfixes for 1.3.1	2023-08-15 16:17:50 +03:00
Ivan Savenko	3aead5f32f	Android build ID bump	2023-08-15 15:06:33 +03:00
Ivan Savenko	8b628221ec	Fix possible thread race on accessing GuiHandler from server handler ... thread without acquiring lock	2023-08-15 00:38:03 +03:00
Ivan Savenko	00ac8eb306	Attempt to fix crash on quitApplication on Android	2023-08-15 00:17:59 +03:00
Michael	0452dbd80d	remove copy of cropped asset	2023-08-14 23:08:20 +02:00
Ivan Savenko	ef0cd0ba6e	Fixed mod dependencies check on save loading to prevent crashes: ... - mods that don't affect game objects can be ignored when loading save - gameplay-affecting mods that were present in save must be active - gameplay-affecting mods that were not in save must not be active	2023-08-14 23:55:04 +03:00
Michael	b2c8cab9f1	use playerColored	2023-08-14 22:22:43 +02:00
nordsoft	d26fdaefe4	Battle timer	2023-08-14 23:31:44 +04:00
Andrii Danylchenko	6c025fd768	Merge pull request #2572 from vcmi/nkai-fix-heroes-not-recruiting ... Nkai fix heroes not recruiting	2023-08-14 21:40:53 +03:00