13106 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	fd3217c875	Fix few more missing BattleID's	2023-09-11 13:20:16 +03:00
Krisztián Szabó	6a5e71aa63	Award 500 experience for towns conquered during a battle.	2023-09-11 09:37:48 +02:00
Laserlicht	2cb28178ae	code review	2023-09-10 20:52:35 +02:00
Nordsoft91	0b0ca3172d	Merge pull request #2788 from Nordsoft91/quick-combat	2023-09-10 16:39:11 +02:00
Nordsoft91	0756f3caf8	Merge pull request #2787 from Nordsoft91/fix-2766	2023-09-10 11:27:27 +02:00
Nordsoft91	0d7f3e61c2	Merge pull request #2789 from vcmi/Nordsoft91-patch-2 ... Update mod.json schema	2023-09-10 02:08:48 +02:00
nordsoft	6e3817f18c	Events serialization	2023-09-10 01:54:55 +02:00
nordsoft	cc3864a0fa	Fix for random dwellings	2023-09-09 21:17:21 +02: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
nordsoft	01bf146640	Change string id	2023-09-09 14:31:44 +02:00
nordsoft	f6e3c6a487	Fix	2023-09-09 14:27:51 +02:00
nordsoft	52cbb613ae	Use pragma once	2023-09-09 11:03:19 +02:00
nordsoft	18c44fc006	Cache archive files	2023-09-09 10:59:29 +02:00
nordsoft	0db51e0517	Minor fixes for lobby	2023-09-09 10:59:29 +02:00
Nordsoft91	93b889eb0f	Merge pull request #2785 from vcmi/Nordsoft91-patch-1	2023-09-09 10:14:42 +02:00
Nordsoft91	d6ff553cac	Fix typo	2023-09-09 02:14:27 +02:00
nordsoft	8f848d8ceb	Merge remote-tracking branch 'upstream/develop' into editor-improvements-1.4 ... # Conflicts: # mapeditor/inspector/inspector.cpp	2023-09-08 17:58:14 +02:00
nordsoft	320cd6bf16	Add rumors	2023-09-08 17:54:34 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	7aef40dfb6	Merge pull request #2781 from vcmi/IvanSavenko-patch-1 ... Fix typo	2023-09-08 16:56:06 +03:00
Ivan Savenko	89c31d0d52	Fix typo	2023-09-08 16:54:51 +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	c4e2417326	Fix crash on obstacle creation (e.g. moat)	2023-09-08 16:35:43 +03:00
Ivan Savenko	8112b8082e	Add new option to settings	2023-09-08 13:23:18 +03:00
Ivan Savenko	9e6424c545	Merge pull request #2775 from IvanSavenko/radial_fill_ones ... (1.3.2) Add "Fill with single creatures" option to radial wheel	2023-09-08 13:16:00 +03:00
Ivan Savenko	5d67481aaf	Merge pull request #2774 from IvanSavenko/beta_bugfixing ... (1.3.2) Beta bugfixing	2023-09-08 13:15:52 +03:00
Ivan Savenko	72858cd0d8	Merge pull request #2768 from IvanSavenko/cherry_picked_fixes ... (1.3.2) Cherry picked fixes	2023-09-08 13:15:34 +03:00
Nordsoft91	24ad06b5c3	Merge pull request #2726 from Nordsoft91/launcher-size-support	2023-09-08 05:47:06 +04:00
nordsoft	0148662847	Merge remote-tracking branch 'upstream/develop' into editor-improvements-1.4 ... # Conflicts: # lib/mapObjects/CGObjectInstance.cpp	2023-09-08 03:22:50 +02:00
nordsoft	ad8d7016b6	Resources in time events	2023-09-08 03:21:31 +02:00
nordsoft	bb4905af48	Change resourceID with ResourcePath	2023-09-08 01:54:29 +02:00
nordsoft	8c94d082c8	Merge remote-tracking branch 'upstream/develop' into launcher-size-support	2023-09-08 01:51:52 +02:00
nordsoft	446c61cce1	Timed events implemented	2023-09-08 01:43:01 +02:00
nordsoft	e8b9034149	Add event settings ui	2023-09-07 23:57:56 +02:00
nordsoft	9e14d8d170	Refactoring map settings	2023-09-07 20:19:31 +02:00
Nordsoft91	43ef20efc5	Merge pull request #2748 from Nordsoft91/lobby-chat ... Advanced chat in lobby	2023-09-07 22:01:43 +04:00
nordsoft	40ea45498f	Rename	2023-09-07 19:57:57 +02:00
Ivan Savenko	587be4c7d5	Merge pull request #2767 from IvanSavenko/dwelling_recruit_fix ... Fixes ownership checks for creature recruitment	2023-09-07 15:09:55 +03:00
Ivan Savenko	635884cb05	Replaced show unit info with fill with one's option in radial	2023-09-07 13:55:58 +03:00
Ivan Savenko	3c23b1bbfa	Integrated recent changes from wiki's	2023-09-07 13:09:41 +03:00
Ivan Savenko	ba017f0e8d	Merge pull request #2749 from SoundSSGood/artifacts-related-fixes ... Artifacts related fixes	2023-09-07 13:03:52 +03:00
Ivan Savenko	33bf367dc0	Updated docs and all internal links	2023-09-07 12:57:03 +03:00
SoundSSGood	1b810b5b93	combined arts assembling fixed	2023-09-07 11:54:52 +03:00
SoundSSGood	f1a6116088	CHeroArea fix	2023-09-07 11:54:50 +03:00
SoundSSGood	3675d88730	fixed highlighting slots	2023-09-07 11:39:29 +03:00
Ivan Savenko	4204e895bc	Updated links	2023-09-07 11:04:01 +03:00
Ivan Savenko	9994452ae0	Updated links	2023-09-07 11:04:01 +03:00
Ivan Savenko	c9dfb6e0f8	Updated developer docs	2023-09-07 11:04:01 +03:00
Ivan Savenko	43e52577cc	Fix links	2023-09-07 11:04:01 +03:00