13035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ivan Savenko	60cbb939ab	Fix crash on window resize	2023-09-12 21:15:15 +03:00
Ivan Savenko	a09147a433	Do not block map layer toggles in world view mode	2023-09-12 21:15:14 +03:00
Ivan Savenko	a5e42755be	Correctly redraw map in world view mode	2023-09-12 21:15:14 +03:00
Ivan Savenko	e4aa981925	Add more logging to mod downloading process	2023-09-12 21:15:14 +03:00
Kryštof Černý	8639d5ff7c	Remove dot in english.json for consistency	2023-09-12 16:27:43 +02:00
Ivan Savenko	fc6fc31a02	Merge pull request #2565 from IvanSavenko/documentation ... (1.3.2) Documentation import	2023-09-12 13:13:52 +03:00
Ivan Savenko	9ae7f53d66	Merge pull request #2791 from Nordsoft91/fix-2790 ... Fix for random dwellings	2023-09-12 12:38:55 +03:00
Nordsoft91	7f321b2fcb	Merge pull request #2800 from PandarinDev/missing_exp_for_towns ... Award 500 experience for towns conquered during a battle.	2023-09-12 00:39:47 +02:00
Nordsoft91	0a799ecc46	Merge pull request #2740 from Laserlicht/fix_cursor_issue	2023-09-11 22:20:11 +02:00
nordsoft	6a0b26d402	Object picker for victory/loss conditions	2023-09-11 20:37:26 +02:00
nordsoft	1ac886ca71	Refactor abstract settings to have map controller	2023-09-11 20:37:26 +02:00
nordsoft	3024aaae30	Town picker in player settings implemented	2023-09-11 20:37:26 +02:00
nordsoft	727284c05e	Bump editor version	2023-09-11 20:37:26 +02:00
nordsoft	19407954ed	Object picker implemented	2023-09-11 20:37:26 +02:00
nordsoft	082e1194ff	Little refactoring	2023-09-11 20:37:26 +02:00
nordsoft	94c6adb28c	Temporary fix for vic/loss conditions string	2023-09-11 20:37:25 +02:00
nordsoft	a89a8019ab	Added skills customization	2023-09-11 20:37:25 +02:00
nordsoft	445e39ad20	Improved inspector	2023-09-11 20:37:25 +02:00
nordsoft	d07fbc2204	Improve bool fields in inspector	2023-09-11 20:37:25 +02:00
nordsoft	5136305455	Fix hero type for random hero	2023-09-11 20:37:25 +02:00
nordsoft	e912a2db38	Better army widget	2023-09-11 20:37:25 +02:00
Nordsoft91	96433436dd	Merge pull request #2782 from Nordsoft91/editor-improvements-1.4 ... Map editor: events, rumors	2023-09-11 20:36:13 +02:00
Krisztián Szabó	cb3cc84c61	Give bonus experience for capturing a town even if the enemy hero escaped.	2023-09-11 19:51:23 +02:00
Nordsoft91	a18aa2cf7e	Merge pull request #2802 from Laserlicht/voice_camp ... Voice for campaigns	2023-09-11 18:15:23 +02:00
Ivan Savenko	f13f213d8c	Merge pull request #2780 from IvanSavenko/fix_siege_regression ... Fix crash on obstacle creation (e.g. moat)	2023-09-11 15:56:33 +03:00
Laserlicht	994da3fcf2	code review	2023-09-11 14:44:07 +02:00
Laserlicht	fa19ed4e7c	format	2023-09-11 14:11:16 +02:00
Laserlicht	00f07f93d1	wait while audio playing; no audio on custom campaigns	2023-09-11 14:04:44 +02:00
Laserlicht	fc1ce85a72	basic voice support	2023-09-11 12:57:10 +02:00
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