1394 Commits

Author	SHA1	Message	Date
Nordsoft91	a36450e2d1	Merge pull request #2882 from Nordsoft91/ai-cheating ... Add basic system to give more advantages for ai player	2023-09-23 03:21:19 +02:00
Ivan Savenko	455c13164e	Merge pull request #2886 from IvanSavenko/h3m_parser_fixes ... H3m parser fixes	2023-09-22 18:53:51 +03:00
Laserlicht	4d8414bd3d	unlock functionality	2023-09-20 23:06:32 +02:00
Ivan Savenko	921569e02e	Fixed "Long Live the King", 1st scenario victory condition	2023-09-20 21:58:47 +03:00
nordsoft	cb3bbc6680	Restructured difficulty config	2023-09-20 16:12:26 +02:00
nordsoft	0de912e67b	Add basic system to add more advantages for ai player	2023-09-20 03:50:35 +02:00
Nordsoft91	86b0804be3	Merge pull request #2841 from krs0/quickfix/fix_market_of_time_missing_template ... Fix Market of Time missing Template	2023-09-18 01:49:41 +02:00
Nordsoft91	717a765123	Merge pull request #2813 from Laserlicht/textcolor ... Textcolor support	2023-09-16 14:12:17 +02:00
Ivan Savenko	a669cc3829	Merge pull request #2839 from krs0/feature/fix_skill_schema ... Fix broken skill schema	2023-09-16 12:02:47 +03:00
krs	f80f594688	Fix Market of Time missing Template	2023-09-15 23:13:43 +03:00
krs	6c9b65c391	Fix adventure map widget json	2023-09-15 22:15:10 +03:00
krs	ffaf4c5b01	Fix broken skill schema	2023-09-15 22:03:23 +03:00
Laserlicht	621d463694	color are now html color names	2023-09-15 15:27:26 +02:00
Laserlicht	f5505c9f6d	support for predefined colors	2023-09-15 15:27:26 +02:00
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Ivan Savenko	feb272e102	Updated map object and bonuses documentations	2023-09-13 21:55:36 +03:00
Ivan Savenko	c6588e0bd1	Updated schemas & docs for several game entities	2023-09-13 21:55:36 +03:00
Ivan Savenko	a09147a433	Do not block map layer toggles in world view mode	2023-09-12 21:15:14 +03:00
Nordsoft91	d011e1ff0d	Update mod.json schema	2023-09-09 15:24:52 +02:00
nordsoft	2b3f211659	Enable quick combat by default	2023-09-09 14:42:13 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	fccd564d8d	Merge pull request #2769 from IvanSavenko/touch_tolerance ... (1.3.2) Implemented tolerance for touch events	2023-09-08 16:45:04 +03:00
Ivan Savenko	8112b8082e	Add new option to settings	2023-09-08 13:23:18 +03:00
nordsoft	8c94d082c8	Merge remote-tracking branch 'upstream/develop' into launcher-size-support	2023-09-08 01:51:52 +02:00
nordsoft	40ea45498f	Rename	2023-09-07 19:57:57 +02:00
Andrii Danylchenko	55af9ed5a0	Fix market of time, crashes game	2023-09-05 23:31:32 +03:00
nordsoft	1ef407ea9f	Fixes	2023-09-02 14:10:50 +04:00
Ivan Savenko	cab2bddf7e	Merge pull request #2712 from Laserlicht/dim_map ... Dim adventuremap	2023-09-01 22:37:10 +03:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00
Michael	e650f0100b	setting + all non popups	2023-08-30 21:41:28 +02:00
Ivan Savenko	695a51d8c8	Merge remote-tracking branch 'vcmi/beta' into develop	2023-08-28 21:19:53 +03:00
Ivan Savenko	5be87b30c1	Merge pull request #2625 from dydzio0614/artifacts-backpack-gui ... Artifacts backpack GUI	2023-08-28 19:59:11 +03:00
nordsoft	432ed18579	Fix overlap of timer and fps widgets	2023-08-28 19:46:09 +04:00
nordsoft	44791b6665	Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9" ... This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.	2023-08-28 17:21:38 +04:00
nordsoft	6380a02e10	Upgrade launcher default repo	2023-08-28 17:10:52 +04:00
nordsoft	1e527a6942	Minor changes	2023-08-28 17:10:52 +04:00
nordsoft	d758727c23	Basic timer ui is almost complete	2023-08-28 17:10:52 +04:00
Nordsoft91	ffc4b989f0	Merge pull request #2679 from Laserlicht/smooth_scroll ... Smooth scroll	2023-08-28 17:08:57 +04:00
Andrii Danylchenko	2fef0e8d40	Fix market of time, crashes game	2023-08-27 21:01:32 +03:00
Michael	bbd69fd430	added setting	2023-08-27 00:33:52 +02:00
Ivan Savenko	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Nordsoft91	979cf129bc	Merge pull request #2637 from Laserlicht/autosave	2023-08-25 00:09:49 +04:00
Michael	b22a9ff2d0	Merge branch 'develop' into autosave	2023-08-23 21:39:04 +02:00
nordsoft	b8ab64f448	Make options tab configurable	2023-08-23 19:29:50 +04:00
Konstantin	d20711bcd6	immunities: polishing	2023-08-23 17:53:09 +03:00
Nordsoft91	1bad0e96ef	Merge pull request #2635 from Nordsoft91/loading-bar ... Loading progress bar	2023-08-23 17:28:19 +04:00
Michael	fed9ae5157	Merge branch 'develop' into autosave	2023-08-23 00:37:15 +02:00
Michael	65884b15d0	Update settings.json ... best setting as default (subfolder with map-name)	2023-08-22 20:51:28 +02:00
nordsoft	d50edc28ab	Merge remote-tracking branch 'upstream/develop' into turn-timer ... # Conflicts: # server/CGameHandler.cpp # server/CGameHandler.h	2023-08-22 00:54:38 +04:00
nordsoft	dbc3a93013	Merge remote-tracking branch 'upstream/develop' into loading-bar ... # Conflicts: # server/CGameHandler.h	2023-08-22 00:46:54 +04:00