nordsoft 0250e6fb92 Merge branch 'develop-upstream' into town-buildings ...

# Conflicts:
#	client/CPlayerInterface.cpp
#	client/windows/CTradeWindow.cpp
#	config/objects/generic.json
#	lib/mapObjects/CGMarket.cpp
#	lib/mapObjects/CGMarket.h
#	lib/mapObjects/CGTownInstance.cpp
#	lib/mapObjects/CommonConstructors.cpp
#	lib/mapObjects/CommonConstructors.h

2023-05-02 01:48:13 +04:00

..

Configuration.cpp

Fix compiling

2023-04-30 22:36:25 +04:00

Configuration.h

deeper decoupling

2023-04-30 17:13:07 +04:00

Info.cpp

Attempt to fix msvs build 1

2023-05-01 01:15:48 +04:00

Info.h

deeper decoupling

2023-04-30 17:13:07 +04:00

Interface.cpp

Merge branch 'develop-upstream' into town-buildings

2023-05-02 01:48:13 +04:00

Interface.h

deeper decoupling

2023-04-30 17:13:07 +04:00

Limiter.cpp

Attempt to fix msvs build 1

2023-05-01 01:15:48 +04:00

Limiter.h

deeper decoupling

2023-04-30 17:13:07 +04:00

Reward.cpp

deeper decoupling

2023-04-30 17:13:07 +04:00

Reward.h

deeper decoupling

2023-04-30 17:13:07 +04:00