12457 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
nordsoft	0c76ae89f8	Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2" ... This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.	2023-08-14 16:33:41 +04:00
krs	5207ba7e00	Removed WoG artifacts from core. Replaced with unused to avoid crashes.	2023-08-14 15:06:48 +03:00
nordsoft	e426924930	Close window at time expiring	2023-08-14 15:37:21 +04:00
nordsoft	23aaa72dfe	No error on hero move when timer is expired	2023-08-14 05:21:57 +04:00
nordsoft	2ce50915e1	Fix ios compilation	2023-08-14 05:03:50 +04:00
nordsoft	a8e5b32b6a	Fix compiling	2023-08-14 04:55:45 +04:00
nordsoft	380ee41fba	Fix finishing turn while flying over object	2023-08-14 04:33:41 +04:00
nordsoft	0c38187916	Fix freezes while turn ends at hero move	2023-08-14 04:06:26 +04:00
nordsoft	e414af221b	Move turn timer logic from GameHandler class	2023-08-14 03:20:27 +04:00
Michael	079e8ba1ba	naming	2023-08-14 00:40:12 +02:00
Michael	7bfbfeb48f	missing	2023-08-14 00:16:53 +02:00
nordsoft	3c9c302fd2	TurnTimerInfo	2023-08-14 02:16:25 +04:00
Michael	bb5ada3bb3	not from this PR	2023-08-14 00:10:06 +02:00
Michael	1d76f456ad	change servercode to make it more robust	2023-08-14 00:08:48 +02:00
nordsoft	f01973a4f0	Configurable turn timer	2023-08-14 01:13:37 +04:00
Michael	ae63088564	outline; squared	2023-08-13 22:58:49 +02:00
nordsoft	093e226bff	Fix compilation	2023-08-13 23:50:40 +04:00
Michael	9a63161866	added random; added names	2023-08-13 20:21:09 +02:00
Michael	e66a41e90b	simplify	2023-08-13 19:23:27 +02:00