12767 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nordsoft	6e3817f18c	Events serialization	2023-09-10 01:54:55 +02:00
nordsoft	52cbb613ae	Use pragma once	2023-09-09 11:03:19 +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	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	ba017f0e8d	Merge pull request #2749 from SoundSSGood/artifacts-related-fixes ... Artifacts related fixes	2023-09-07 13:03:52 +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	bef97889e9	Merge pull request #2773 from wb180/blindedStackMoraleFix ... Blinded stack should not be able to get morale	2023-09-07 10:54:51 +03:00
Ivan Savenko	ef0eb8e930	Merge pull request #2772 from wb180/tavernPoolHeroesFix ... Remove(reduce durations) of bonuses for tavern heroes	2023-09-07 10:54:44 +03:00
Ivan Savenko	4615a4e3ea	Merge pull request #2761 from IvanSavenko/fix_launcher_freeze ... (1.3.2) Fix Launcher freeze on startup	2023-09-07 10:51:09 +03:00
Ivan Savenko	f39fbe5151	Merge pull request #2757 from IvanSavenko/filesystem_refactor ... Filesystem refactor - part 1	2023-09-07 10:51:02 +03:00
Ivan Savenko	346eead8e0	Show spell cursor when casting spell in touch input mode	2023-09-06 23:01:43 +03:00
Ivan Savenko	e5719daf11	Added "vcmiartifacts angelWings" form to cheat	2023-09-06 22:44:41 +03:00
Ivan Savenko	d7fb2bcf83	Show message on cancelling spell in combat	2023-09-06 21:54:26 +03:00
Ivan Savenko	5f07f3f091	Merge pull request #2673 from IvanSavenko/concurrent_battles ... Concurrent battles support	2023-09-06 19:24:27 +03:00
Ivan Savenko	1f1f978328	Fixed battle replay	2023-09-06 16:03:47 +03:00
Ivan Savenko	8bdddd1324	Fix tests compilation	2023-09-06 16:03:47 +03:00
Ivan Savenko	ef94e7a78a	Fix build	2023-09-06 16:03:47 +03:00
Ivan Savenko	9fa7a93fb0	Properly pass battleID in all battle netpack's	2023-09-06 16:03:47 +03:00
Ivan Savenko	747e28947a	Fix build	2023-09-06 16:03:47 +03:00
Ivan Savenko	41210c1dbf	Client-side support for multiple battles	2023-09-06 16:03:47 +03:00
Ivan Savenko	036df2e0ad	Support multiple battles in AI	2023-09-06 16:03:46 +03:00
Ivan Savenko	3a88180494	Separated game and battle callback (server & client only)	2023-09-06 16:03:39 +03:00
Ivan Savenko	fc4dfda00f	Added support for concurrent battles to gamestate and server	2023-09-06 16:03:02 +03:00
Ivan Savenko	a21de70516	Merge pull request #2758 from IvanSavenko/identifiers_serialization_fix ... Fix serialization of identifers by Json Serializer	2023-09-06 15:21:54 +03:00
Evgeniy Meshcheryakov	e9c2d4e857	Blinded stack should not be able to get morale	2023-09-06 12:40:05 +03:00
Michael	287c0daaff	add also savegame	2023-09-06 12:34:31 +03:00
Michael	36ab973dc8	fix difficulty widget	2023-09-06 12:34:23 +03:00
Ivan Savenko	f92af94f19	Fix crash on removing object during visit	2023-09-06 12:32:26 +03:00