12783 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Evgeniy Meshcheryakov	2a83f06905	Preserve order of secondary skills during hero serialization/deserialization	2023-08-14 00:06:22 +03: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
Michael	c14448ee32	change design	2023-08-13 15:09:48 +02:00
nordsoft	4b1224ec8c	Implement turn timer feature	2023-08-13 14:07:48 +04:00
Andrii Danylchenko	a7859dae39	Battle AI: archangels cast again	2023-08-13 09:08:30 +03:00
Andrii Danylchenko	1eabb738dc	NKAI: fix heroes not recruited	2023-08-13 09:08:30 +03:00
Ivan Savenko	abf7c48593	Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race ... Fix crash on video playback (and who knows how many more)	2023-08-13 00:45:24 +03:00
Michael	daa8bc547f	icon fix	2023-08-12 23:28:53 +02:00
Michael	f71f4a874b	Grid and Activaed	2023-08-12 22:59:45 +02:00
Michael	b73f9d6e30	calculate size	2023-08-12 21:50:40 +02:00
Michael	18b963f376	fix	2023-08-12 20:31:00 +02:00
Michael	3d08ecf024	rename	2023-08-12 20:02:36 +02:00
Michael	92159e57ef	Update SelectionTab.cpp ... fix possible -1	2023-08-12 19:51:18 +02:00
Michael	8bb7fd31cd	basically running...	2023-08-12 19:33:25 +02:00
Michael	481cd89dc8	drawing	2023-08-12 18:20:44 +02:00
Michael	c40c747ccf	saving states	2023-08-12 17:46:35 +02:00
Michael	876dc28e48	rework	2023-08-12 16:49:42 +02:00
Ivan Savenko	f13a53c1d9	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-12 17:28:47 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Michael	bc4d331888	Title	2023-08-12 15:19:40 +02:00
Michael	0c4f4daf70	base rendering	2023-08-12 15:05:26 +02:00
Michael	b4f6c7abab	big images; basic heroes support	2023-08-12 13:19:58 +02:00
Ivan Savenko	626664b8f6	Fix possible thread race on accessing GuiHandler from server handler ... thread without acquiring lock	2023-08-12 14:16:47 +03:00
Ivan Savenko	5dc735494c	Merge pull request #2554 from IvanSavenko/crashfixes ... Fixes for crashes from Android crash reporter	2023-08-12 11:55:50 +03:00
Tomasz Zieliński	abacb5f0ea	Fix resources placed behind mines	2023-08-12 10:53:25 +02:00
Ivan Savenko	8cbc52364a	Merge pull request #2496 from IvanSavenko/saves_in_mods ... Allowed loading saves from inside mods	2023-08-12 11:27:15 +03:00