nordsoft 0a28262c15 Merge remote-tracking branch 'upstream/develop' into boats ... # Conflicts: # AI/VCAI/Pathfinding/AINodeStorage.cpp		2023-04-19 02:22:19 +04:00
..
effects	Merge pull request #1932 from rilian-la-te/proper-teleport	2023-04-16 22:52:01 +03:00
AbilityCaster.cpp	vcmi: rework ProxyCaster	2023-03-30 14:41:40 +03:00
AbilityCaster.h	vcmi: rework ProxyCaster	2023-03-30 14:41:40 +03:00
AdventureSpellMechanics.cpp	Summon boat for real boats only	2023-04-18 22:21:26 +04:00
AdventureSpellMechanics.h
BattleSpellMechanics.cpp	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
BattleSpellMechanics.h
BonusCaster.cpp	vcmi: rework ProxyCaster	2023-03-30 14:41:40 +03:00
BonusCaster.h	vcmi: rework ProxyCaster	2023-03-30 14:41:40 +03:00
CSpellHandler.cpp	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
CSpellHandler.h	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
ExternalCaster.cpp	Rename outer caster	2023-04-10 20:56:50 +04:00
ExternalCaster.h	Rename outer caster	2023-04-10 20:56:50 +04:00
ISpellMechanics.cpp	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
ISpellMechanics.h	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
ObstacleCasterProxy.cpp	Merge beta into develop	2023-04-11 19:37:35 +03:00
ObstacleCasterProxy.h	Merge beta into develop	2023-04-11 19:37:35 +03:00
Problem.cpp
Problem.h
ProxyCaster.cpp	Merge beta into develop	2023-04-11 19:37:35 +03:00
ProxyCaster.h	Merge beta into develop	2023-04-11 19:37:35 +03:00
TargetCondition.cpp	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
TargetCondition.h	vcmi: selector-based target conditions	2023-03-16 16:46:42 +03:00
ViewSpellInt.cpp
ViewSpellInt.h