1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Alexander Wilms
2023-10-29 13:35:37 +00:00
168 changed files with 3890 additions and 3342 deletions

View File

@@ -14,13 +14,15 @@
#include <vcmi/spells/Spell.h>
#include <vcmi/spells/Service.h>
#include "../NetPacks.h"
#include "../CSoundBase.h"
#include "../CSkillHandler.h"
#include "../StartInfo.h"
#include "../IGameCallback.h"
#include "../constants/StringConstants.h"
#include "../networkPacks/PacksForClient.h"
#include "../networkPacks/PacksForClientBattle.h"
#include "../mapObjects/CGHeroInstance.h"
#include "../serializer/JsonSerializeFormat.h"
VCMI_LIB_NAMESPACE_BEGIN