1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-25 21:38:59 +02:00
nordsoft d72f50da6d Merge tag 'MapEditor0.0.3' into vlc-obstacles
# Conflicts:
#	client/CGameInfo.cpp
#	client/CGameInfo.h
#	client/battle/CBattleInterface.cpp
#	config/gameConfig.json
#	config/obstacles.json
#	config/schemas/battlefield.json
#	config/schemas/obstacle.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/VCMI_Lib.cpp
#	lib/VCMI_Lib.h
#	lib/battle/BattleInfo.cpp
#	lib/spells/CSpellHandler.cpp
#	test/mock/mock_Services.h
2022-09-13 03:28:23 +04:00
..
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2020-10-04 02:20:18 -07:00
2022-09-11 11:31:27 +03:00
2022-09-11 18:50:59 +04:00
2022-09-11 18:50:59 +04:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00