DarkRadiant: master c0e4b437

Author Committer Branch Timestamp Parent
greebo greebo master 2021-06-02 18:26:47 master 1aeb5095
Affected Issues  0005603: Ability to choose from several different pointfiles
Changeset Merge remote-tracking branch 'remotes/origin/merge_visualisation'
mod - LICENSE Diff File
add - include/icomparablenode.h Diff File
mod - include/iglrender.h Diff File
mod - include/imap.h Diff File
add - include/imapmerge.h Diff File
mod - include/inode.h Diff File
mod - include/irenderable.h Diff File
mod - include/iselection.h Diff File
add - install/bitmaps/merge_arrow.png Diff File
add - install/bitmaps/merge_fork.png Diff File
add - install/bitmaps/merge_selection_mode.png Diff File
mod - install/menu.xml Diff File
add - install/ui/mergecontroldialog.fbp Diff File
add - install/ui/mergecontroldialog.xrc Diff File
mod - install/user.xml Diff File
mod - libs/UndoFileChangeTracker.h Diff File
mod - libs/math/CMakeLists.txt Diff File
add - libs/math/Hash.h Diff File
add - libs/math/SHA256.cpp Diff File
add - libs/math/SHA256.h Diff File
mod - libs/render/CamRenderer.h Diff File
mod - libs/render/RenderableCollectionWalker.h Diff File
mod - libs/render/VertexHashing.h Diff File
mod - libs/scene/CMakeLists.txt Diff File
mod - libs/scene/Node.cpp Diff File
mod - libs/scene/Node.h Diff File
add - libs/scene/merge/ComparisonResult.h Diff File
add - libs/scene/merge/GraphComparer.cpp Diff File
add - libs/scene/merge/GraphComparer.h Diff File
add - libs/scene/merge/MergeAction.h Diff File
add - libs/scene/merge/MergeOperation.cpp Diff File
add - libs/scene/merge/MergeOperation.h Diff File
mod - libs/scenelib.h Diff File
mod - libs/wxutil/dataview/TreeViewItemStyle.h Diff File
mod - libs/wxutil/preview/RenderPreview.cpp Diff File
mod - libs/wxutil/preview/RenderPreview.h Diff File
mod - radiant/CMakeLists.txt Diff File
mod - radiant/camera/CamWnd.cpp Diff File
mod - radiant/camera/CamWnd.h Diff File
mod - radiant/ui/SelectionModeToggle.h Diff File
mod - radiant/ui/UserInterfaceModule.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.h Diff File
add - radiant/ui/merge/MergeControlDialog.cpp Diff File
add - radiant/ui/merge/MergeControlDialog.h Diff File
mod - radiant/xyview/XYRenderer.h Diff File
mod - radiant/xyview/XYWnd.cpp Diff File
mod - radiant/xyview/XYWnd.h Diff File
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/brush/BrushNode.cpp Diff File
mod - radiantcore/brush/BrushNode.h Diff File
mod - radiantcore/entity/EntityNode.cpp Diff File
mod - radiantcore/entity/EntityNode.h Diff File
mod - radiantcore/layers/LayerManager.cpp Diff File
mod - radiantcore/map/Map.cpp Diff File
mod - radiantcore/map/Map.h Diff File
mod - radiantcore/map/MapResource.cpp Diff File
add - radiantcore/map/MergeActionNode.cpp Diff File
add - radiantcore/map/MergeActionNode.h Diff File
mod - radiantcore/map/RegionWalkers.h Diff File
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
mod - radiantcore/patch/PatchNode.cpp Diff File
mod - radiantcore/patch/PatchNode.h Diff File
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp Diff File
mod - radiantcore/selection/RadiantSelectionSystem.cpp Diff File
mod - radiantcore/selection/RadiantSelectionSystem.h Diff File
mod - radiantcore/selection/SelectionTestWalkers.cpp Diff File
mod - radiantcore/selection/SelectionTestWalkers.h Diff File
mod - radiantcore/selection/algorithm/General.cpp Diff File
mod - test/CMakeLists.txt Diff File
add - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/fingerprinting.mapx Diff File
add - test/resources/tdm/maps/fingerprinting_2.mapx Diff File
mod - tools/msvc/DarkRadiant.vcxproj Diff File
mod - tools/msvc/DarkRadiant.vcxproj.filters Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/Tests/Tests.vcxproj Diff File
mod - tools/msvc/Tests/Tests.vcxproj.filters Diff File
mod - tools/msvc/include.vcxproj Diff File
mod - tools/msvc/mathlib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File