nordsoft e5e5e78fca Merge remote-tracking branch 'upstream/develop' into vlc-obstacles ... # Conflicts: # .github/workflows/github.yml # CI/mac/before_install.sh # client/CGameInfo.cpp # client/CGameInfo.h # client/battle/CBattleInterface.cpp # config/gameConfig.json # config/obstacles.json # config/randomMap.json # config/schemas/battlefield.json # config/terrains.json # include/vcmi/Services.h # lib/BattleFieldHandler.cpp # lib/BattleFieldHandler.h # lib/CHeroHandler.cpp # lib/CHeroHandler.h # lib/CModHandler.cpp # lib/GameConstants.cpp # lib/GameConstants.h # lib/IGameCallback.cpp # lib/Terrain.cpp # lib/Terrain.h # lib/VCMI_Lib.cpp # lib/VCMI_Lib.h # lib/battle/BattleInfo.cpp # lib/mapObjects/CObjectClassesHandler.cpp # lib/mapObjects/CObjectClassesHandler.h # lib/mapObjects/ObjectTemplate.cpp # lib/mapObjects/ObjectTemplate.h # lib/mapping/CCampaignHandler.h # lib/rmg/CMapGenerator.cpp # lib/rmg/CMapGenerator.h # lib/rmg/ConnectionsPlacer.cpp # lib/rmg/ObjectManager.cpp # lib/rmg/ObjectManager.h # lib/rmg/ObstaclePlacer.cpp # lib/rmg/RiverPlacer.cpp # lib/rmg/RmgObject.cpp # lib/rmg/RoadPlacer.cpp # lib/rmg/RoadPlacer.h # lib/rmg/TownPlacer.cpp # lib/rmg/TreasurePlacer.cpp # lib/rmg/TreasurePlacer.h # lib/rmg/WaterProxy.cpp # lib/spells/CSpellHandler.cpp # test/mock/mock_Services.h		2022-09-13 03:00:32 +04:00
..
battle	Merge remote-tracking branch 'upstream/develop' into vlc-obstacles	2022-09-13 03:00:32 +04:00
gui	use Conan to make macOS CI builds for both Intel and ARM (#782)	2022-08-30 17:29:00 +03:00
icons
lobby	Fix start game button for rmg without templates (#781)	2022-08-30 08:30:21 +03:00
mainmenu	Fix: 'Load' and 'Main menu' in-game buttons should work properly	2021-01-17 19:18:26 +03:00
widgets	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
windows	add standard hotkeys to the Quick Recruitment dialog	2022-09-11 11:31:28 +03:00
CBitmapHandler.cpp	Fixed RETURN_IF_BATTLE(). Undid disabled warnings. Fixed indentation.	2020-10-05 16:28:28 -07:00
CBitmapHandler.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
CGameInfo.cpp	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +03:00
CGameInfo.h	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +03:00
Client.cpp	New terrain support - part 1 (#755)	2022-09-11 11:31:26 +03:00
Client.h	Fixed: duplicated bonusing building. Improved: opposite bonus propagation	2021-09-12 14:30:54 +03:00
CMakeLists.txt	use Conan to make macOS CI builds for both Intel and ARM (#782)	2022-08-30 17:29:00 +03:00
CMessage.cpp	Fixed RETURN_IF_BATTLE(). Undid disabled warnings. Fixed indentation.	2020-10-05 16:28:28 -07:00
CMessage.h	Gui cleanup4 (#446)	2018-07-25 01:36:48 +03:00
CMT.cpp	use Conan to make macOS CI builds for both Intel and ARM (#782)	2022-08-30 17:29:00 +03:00
CMT.h	Full rework of pre-game interface and networking	2018-04-04 14:24:26 +07:00
CMusicHandler.cpp	New terrain support - part 1 (#755)	2022-09-11 11:31:26 +03:00
CMusicHandler.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
CPlayerInterface.cpp	New terrain support - part 1 (#755)	2022-09-11 11:31:26 +03:00
CPlayerInterface.h	Fix: Get rid of 'Tile is not visible' error message	2022-01-30 12:31:07 +02:00
CreatureCostBox.cpp	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
CreatureCostBox.h	Gui cleanup3 - UI refactoring to use smart pointers (#440)	2018-04-07 18:34:11 +07:00
CServerHandler.cpp	fix launching server when Windows user name has non-latin characters	2022-09-11 11:31:28 +03:00
CServerHandler.h	Add proper thread synchronization for campaigns	2019-03-30 00:28:33 +01:00
CVideoHandler.cpp	CVideoHandler: fix codecContext according to docs	2022-05-14 13:22:41 +03:00
CVideoHandler.h	CVideoHandler: use new ffmpeg	2022-05-14 13:22:41 +03:00
DPIaware.manifest
Graphics.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
Graphics.h	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
mapHandler.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
mapHandler.h	New terrain support - part 1 (#755)	2022-09-11 11:31:26 +03:00
NetPacksClient.cpp	Fix: Get rid of 'Tile is not visible' error message	2022-01-30 12:31:07 +02:00
NetPacksLobbyClient.cpp	Remove empty branch from LobbyClientConnected::applyOnLobbyScreen (#507)	2018-10-30 04:59:02 +03:00
resource.h
SDLRWwrapper.cpp
SDLRWwrapper.h	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
StdInc.cpp
StdInc.h
VCMI_client.cbp	Entities redesign and a few ERM features	2021-02-14 19:05:43 +03:00
VCMI_client.rc
VCMI_client.vcxproj	Update VS files to 2019, partially fix test project	2019-06-09 17:28:55 +02:00
VCMI_client.vcxproj.filters	Update project files to match vcmi code changes	2018-07-06 18:52:51 +02:00
vcmi.ico