5 Commits

Author	SHA1	Message	Date
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
nordsoft	6fc3bb6690	Attempt to fix msvs build 1	2023-05-01 01:15:48 +04:00
nordsoft	e9279cfbc4	Blocking dialogs supported	2023-05-01 00:14:53 +04:00
nordsoft	5bdd6c5cf5	Fix compiling	2023-04-30 22:36:25 +04:00
nordsoft	1b4d117790	deeper decoupling	2023-04-30 17:13:07 +04:00