games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/develop' into fix_rmg_teams

Browse Source 
# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp
This commit is contained in:
Tomasz Zieliński
2023-10-30 20:08:13 +01:00
parent 3504cd4e6c 29a78c14a2
commit e105b23a37
304 changed files with 20051 additions and 19326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/battle/CBattleInfoCallbackTest.cpp
View File

@@ -14,8 +14,6 @@
#include <vstd/RNG.h>
#include "../../lib/NetPacksBase.h"
#include "mock/mock_BonusBearer.h"
#include "mock/mock_battle_IBattleState.h"
#include "mock/mock_battle_Unit.h"

1
test/battle/CHealthTest.cpp
View File

@@ -12,7 +12,6 @@
#include "mock/mock_battle_Unit.h"
#include "mock/mock_BonusBearer.h"
#include "../../lib/battle/CUnitState.h"
#include "../../lib/NetPacksBase.h"
using namespace testing;
using namespace battle;

2
test/events/ApplyDamageTest.cpp
View File

@@ -12,7 +12,7 @@
#include <vcmi/events/EventBus.h>
#include "../../lib/events/ApplyDamage.h"
#include "../../lib/NetPacks.h"
#include "../../lib/networkPacks/PacksForClientBattle.h"
#include "../mock/mock_Environment.h"
#include "../mock/mock_battle_Unit.h"

4
test/game/CGameStateTest.cpp
View File

@@ -16,7 +16,9 @@
#include "../../lib/VCMIDirs.h"
#include "../../lib/gameState/CGameState.h"
#include "../../lib/NetPacks.h"
#include "../../lib/networkPacks/PacksForClient.h"
#include "../../lib/networkPacks/PacksForClientBattle.h"
#include "../../lib/networkPacks/SetStackEffect.h"
#include "../../lib/StartInfo.h"
#include "../../lib/TerrainHandler.h"

1
test/mock/BattleFake.h
View File

@@ -20,7 +20,6 @@
#endif
#include "../../lib/JsonNode.h"
#include "../../lib/NetPacksBase.h"
#include "../../lib/battle/CBattleInfoCallback.h"
namespace test

1
test/netpacks/EntitiesChangedTest.cpp
View File

@@ -11,6 +11,7 @@
#include "StdInc.h"
#include "NetPackFixture.h"
#include "../../lib/networkPacks/PacksForClient.h"
namespace test
{

1
test/netpacks/NetPackFixture.h
View File

@@ -10,7 +10,6 @@
#pragma once
#include "../../lib/NetPacks.h"
#include "../../lib/gameState/CGameState.h"
namespace test

2
test/scripting/LuaSpellEffectAPITest.cpp
View File

@@ -11,7 +11,7 @@
#include "ScriptFixture.h"
#include "../../lib/NetPacks.h"
#include "../../lib/networkPacks/PacksForClientBattle.h"
#include "../mock/mock_ServerCallback.h"

1
test/scripting/ScriptFixture.h
View File

@@ -16,7 +16,6 @@
#include "../../lib/JsonNode.h"
#include "../../lib/ScriptHandler.h"
#include "../../lib/NetPacksBase.h"
#include "../../lib/battle/CBattleInfoCallback.h"
#include "../../lib/bonuses/Bonus.h"

1
test/spells/AbilityCasterTest.cpp
View File

@@ -13,7 +13,6 @@
#include "mock/mock_BonusBearer.h"
#include "mock/mock_spells_Spell.h"
#include "../../lib/NetPacksBase.h"
#include "../../lib/spells/AbilityCaster.h"
namespace test

1
test/spells/TargetConditionTest.cpp
View File

@@ -11,7 +11,6 @@
#include <vstd/RNG.h>
#include "../../lib/NetPacksBase.h"
#include "../../lib/spells/TargetCondition.h"
#include "../../lib/serializer/JsonDeserializer.h"

3
test/spells/effects/EffectFixture.cpp
View File

@@ -13,7 +13,8 @@
#include <vstd/RNG.h>
#include "../../../lib/NetPacks.h"
#include "../../../lib/networkPacks/PacksForClientBattle.h"
#include "../../../lib/networkPacks/SetStackEffect.h"
#include "../../../lib/serializer/JsonDeserializer.h"

1
test/spells/effects/EffectFixture.h
View File

@@ -34,7 +34,6 @@
#include "../../../lib/JsonNode.h"
#include "../../../lib/NetPacksBase.h"
#include "../../../lib/battle/CBattleInfoCallback.h"
namespace battle

1
test/spells/targetConditions/TargetConditionItemFixture.h
View File

@@ -12,7 +12,6 @@
#include <vstd/RNG.h>
#include "../../../lib/NetPacksBase.h"
#include "../../../lib/spells/TargetCondition.h"