Merge remote-tracking branch 'origin/vlc-obstacles' into vlc-obstacles

Browse Source

# Conflicts:
#	lib/LoadProgress.cpp
#	lib/LoadProgress.h
#	lib/ObstacleHandler.cpp
#	lib/ObstacleHandler.h
#	lib/battle/BattleInfo.cpp
#	lib/battle/CObstacleInstance.cpp
#	lib/filesystem/Filesystem.h
#	lib/mapObjects/CGHeroInstance.h
#	lib/mapObjects/CGTownInstance.cpp
#	lib/mapObjects/CGTownInstance.h
#	lib/mapObjects/CObjectHandler.cpp
#	lib/mapObjects/CObjectHandler.h
#	lib/mapping/CMap.cpp
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.h
#	lib/mapping/CMapOperation.cpp
#	lib/mapping/CMapOperation.h
#	lib/mapping/MapEditUtils.cpp
#	lib/mapping/MapEditUtils.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CRmgTemplateStorage.cpp
#	lib/rmg/CRmgTemplateStorage.h

...

This commit is contained in:

nordsoft 2022-09-17 17:47:36 +04:00

parent 1b6f4a5cf3 0473f69c2f

commit 12c71c154f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available