DarkRadiant: master c34710e3

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 03.07.2021 12:01 master 9a8ed7c7
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: Ensure that adding func_* entities from the source scene keeps the "model"=="name" equality intact.
Move some classes to scenelib.
mod - include/imapmerge.h Diff File
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc Diff File
mod - libs/scene/CMakeLists.txt Diff File
mod - libs/scene/merge/MergeAction.h Diff File
mod - libs/scene/merge/MergeLib.h Diff File
mod - libs/scene/merge/MergeOperationBase.cpp Diff File
mod - libs/scene/merge/MergeOperationBase.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/map/Map.cpp Diff File
mod - radiantcore/map/Map.h Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File