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 'upstream/develop' into town-buildings

Browse Source 
# Conflicts:
#	lib/CTownHandler.cpp
#	lib/rewardable/Interface.cpp
This commit is contained in:
nordsoft
2023-05-04 22:23:44 +04:00
parent 9984351302 9373239c03
commit ce80c83ca2
180 changed files with 5495 additions and 5139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/registerTypes/RegisterTypes.h
View File

@@ -23,6 +23,10 @@
#include "../mapObjects/MapObjects.h"
#include "../mapObjects/CGTownBuilding.h"
#include "../battle/CObstacleInstance.h"
#include "../bonuses/CBonusSystemNode.h"
#include "../bonuses/Limiters.h"
#include "../bonuses/Updaters.h"
#include "../bonuses/Propagators.h"
#include "../CStack.h"
VCMI_LIB_NAMESPACE_BEGIN