12755 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ivan Savenko	aef8ef1d55	Merge pull request #2559 from IvanSavenko/campaign_bonus_fix ... Preserve chosen campaign bonus on scenario restart request	2023-08-12 11:24:30 +03:00
Ivan Savenko	ccf31d19f8	Merge pull request #2558 from IvanSavenko/localization_fix ... Do not ignore translations for maps & campaigns	2023-08-12 11:24:19 +03:00
Ivan Savenko	f5bb8f5d52	Merge pull request #2557 from IvanSavenko/configure_reserved_width ... Configure reserved width on mobile platforms	2023-08-12 11:23:53 +03:00
Ivan Savenko	e386309fbc	Merge pull request #2547 from IvanSavenko/instant_fadeout ... Make object fade-out / fade-in instant on instant movement speed	2023-08-12 11:23:26 +03:00
DjWarmonger	654489d5d3	Merge pull request #2525 from vcmi/battle-fast-targets ... Battle fast targets	2023-08-12 09:22:25 +02:00
DjWarmonger	917f846a3a	Merge pull request #2562 from vcmi/fix_artifact_replacement ... Fix regression with replacing quest artifact	2023-08-12 09:14:21 +02:00
DjWarmonger	4d4eaed808	Merge pull request #2555 from vcmi/fix_rmg_object_pos ... Fix hota offset + 2 possible crashes	2023-08-12 09:14:02 +02:00
Michael	d0522b0fee	initial window	2023-08-12 02:41:48 +02:00
Michael	52f00ec308	extra function: getFormattedDateTime	2023-08-12 01:13:03 +02:00
Michael	4d507f3d8a	format fix	2023-08-12 00:00:35 +02:00
Michael	f0b60cf166	suggestions; use internally uppercase; fix; fullname	2023-08-11 23:56:20 +02:00
Tomasz Zieliński	4741bd546f	Fix regression	2023-08-11 20:13:25 +02:00
Michael	6ca5518ff1	Buxfix	2023-08-11 20:09:41 +02:00
Tomasz Zieliński	8f450cf253	Fix for monsters spawning at left side of the map	2023-08-11 18:43:22 +02:00
nordsoft	70d04ad957	Replace thread approach with callback based	2023-08-11 20:04:14 +04:00
Ivan Savenko	4ebb490740	Android build version bump for hotfix	2023-08-11 18:54:24 +03:00
Ivan Savenko	20e10cd5ab	Fix potential access to empty std function on hero vs hero combat	2023-08-11 18:52:22 +03:00
SoundSSGood	119d51d1ef	altar sacrifice all fix	2023-08-11 18:51:59 +03:00
Ivan Savenko	4b307dc0e4	More locks to avoid data races on server	2023-08-11 18:50:39 +03:00
Ivan Savenko	ad2bd897d0	Replace boost::format with MetaString ... Looks like some of H3 localizations don't have string replacements for building / war machine name, resulting in exceptions on formatting attempt. MetaString handles this case silently.	2023-08-11 18:50:39 +03:00
Ivan Savenko	9d7f46f985	Fix crash on right-clicking player flags in RMG UI	2023-08-11 18:50:39 +03:00
Ivan Savenko	631e93e846	Fix missing lock of player interface	2023-08-11 18:50:39 +03:00
Ivan Savenko	942f8bbf05	Fix possible access to non-existing building	2023-08-11 18:50:39 +03:00
Ivan Savenko	67b7c39761	Fix possible nullptr dereference	2023-08-11 18:50:39 +03:00
Ivan Savenko	b002c015cf	Merge pull request #2556 from SoundSSGood/altar-fix ... altar "sacrifice all" fix	2023-08-11 17:06:17 +03:00
Ivan Savenko	775e5948ec	Preserve chosen campaign bonus on scenario restart request	2023-08-11 16:55:20 +03:00
Ivan Savenko	474045194a	Do not ignore translations for maps & campaigns	2023-08-11 16:12:02 +03:00
Ivan Savenko	c0e51fc13e	Update translations	2023-08-11 15:08:22 +03:00