Changesets: DarkRadiant
master c0e4b437 02.06.2021 18:26 Details Diff |
Merge remote-tracking branch 'remotes/origin/merge_visualisation' |
Affected Issues 0005603 |
|
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 | ||
master e3238aca 01.06.2021 19:38 Details Diff |
Clean up some unneeded methods on PointFile |
Affected Issues 0005603 |
|
mod - radiantcore/map/PointFile.cpp | Diff File | ||
mod - radiantcore/map/PointFile.h | Diff File | ||
master 7913c055 01.06.2021 19:32 Details Diff |
Use PointTrace to parse point data The parsing code currently covered by unit tests is now used in the main application. |
Affected Issues 0005603 |
|
mod - radiantcore/map/PointFile.cpp | Diff File | ||
master eba4a9ef 01.06.2021 19:03 Details Diff |
Show pointfile selected in PointFileChooser Add a new method to the IMap interface to show a pointfile specified with an fs::path. This method is now called by the PointFileChooser to show the pointfile selected in the wxChoice dropdown. |
Affected Issues 0005603 |
|
mod - include/imap.h | Diff File | ||
mod - radiant/ui/PointFileChooser.cpp | Diff File | ||
mod - radiant/ui/PointFileChooser.h | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
mod - radiantcore/map/PointFile.cpp | Diff File | ||
mod - radiantcore/map/PointFile.h | Diff File | ||
merge_visualisation 07b28352 31.05.2021 19:27 Details Diff |
Require VS version 16.9 | ||
mod - .github/workflows/build.yml | Diff File | ||
merge_visualisation 5d11d87c 31.05.2021 19:27 Details Diff |
Require VS version 16.9 | ||
mod - .github/workflows/build.yml | Diff File | ||
merge_visualisation 5d3c2e2a 31.05.2021 19:27 Details Diff |
Require VS version 16.7-16.9 | ||
mod - .github/workflows/build.yml | Diff File | ||
merge_visualisation 588c32c9 31.05.2021 19:18 Details Diff |
0005623: Merge summary displaying some numbers |
Affected Issues 0005623 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - install/user.xml | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
merge_visualisation 10cf7004 31.05.2021 19:08 Details Diff |
0005623: Extract merge operation interface, rename interface header file. |
Affected Issues 0005623 |
|
mod - include/imap.h | Diff File | ||
mod - libs/render/RenderableCollectionWalker.h | Diff File | ||
mod - libs/scene/merge/MergeAction.h | Diff File | ||
mod - libs/scene/merge/MergeOperation.cpp | Diff File | ||
mod - libs/scene/merge/MergeOperation.h | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.h | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
mod - radiantcore/map/MergeActionNode.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
mod - test/MapMerging.cpp | Diff File | ||
mod - tools/msvc/include.vcxproj | Diff File | ||
merge_visualisation 789a7485 31.05.2021 18:52 Details Diff |
0005623: Prepare action summary display |
Affected Issues 0005623 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
merge_visualisation a0c15c37 31.05.2021 18:36 Details Diff |
0005623: Show the dialog when the menu item is selected, instead of toggling it |
Affected Issues 0005623 |
|
mod - radiant/ui/UserInterfaceModule.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
merge_visualisation 4f17e1c1 31.05.2021 18:28 Details Diff |
0005628: Fall back to use an alternative styling of key value rows in the EntityInspector. Since we're stuck with old wxWidgets versions in Linux and macOS. Fix a crash at shutdown due to the EntityInspector keeping a set of MergeActions alive. |
||
mod - libs/wxutil/dataview/TreeViewItemStyle.h | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
merge_visualisation 899ac8ff 31.05.2021 18:28 Details Diff |
0005623: Fall back to use an alternative styling of key value rows in the EntityInspector. Since we're stuck with old wxWidgets versions in Linux and macOS. Fix a crash at shutdown due to the EntityInspector keeping a set of MergeActions alive. |
Affected Issues 0005623 |
|
mod - libs/wxutil/dataview/TreeViewItemStyle.h | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
merge_visualisation 53367571 31.05.2021 04:47 Details Diff |
0005628: Menu item casing | ||
mod - install/menu.xml | Diff File | ||
merge_visualisation 914131e0 31.05.2021 04:47 Details Diff |
0005623: Menu item casing |
Affected Issues 0005623 |
|
mod - install/menu.xml | Diff File | ||
merge_visualisation 7d3b9a11 31.05.2021 04:46 Details Diff |
0005628: Control dialog size and position on initial startup | ||
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - install/user.xml | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
merge_visualisation 539f7f5f 31.05.2021 04:46 Details Diff |
0005623: Control dialog size and position on initial startup |
Affected Issues 0005623 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - install/user.xml | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
merge_visualisation 21525244 31.05.2021 04:41 Details Diff |
0005628: UI tweaks | ||
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
merge_visualisation 44e6df44 31.05.2021 04:41 Details Diff |
0005623: UI tweaks |
Affected Issues 0005623 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
merge_visualisation 0ec0f68f 31.05.2021 04:37 Details Diff |
0005628: Update the UI when a map is unloaded or loaded in the middle of a merge operation | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
merge_visualisation 904227cd 31.05.2021 04:37 Details Diff |
0005623: Update the UI when a map is unloaded or loaded in the middle of a merge operation |
Affected Issues 0005623 |
|
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
merge_visualisation fd0f9d78 31.05.2021 04:24 Details Diff |
0005628: Implement context menu option to reject key value changes | ||
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
merge_visualisation 2d4c6f97 31.05.2021 04:24 Details Diff |
0005623: Implement context menu option to reject key value changes |
Affected Issues 0005623 |
|
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
merge_visualisation 7dab892f 31.05.2021 04:17 Details Diff |
0005628: Add unimplemented context menu option to reject key value changes | ||
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.h | Diff File | ||
merge_visualisation d64ecbc7 31.05.2021 04:17 Details Diff |
0005623: Add unimplemented context menu option to reject key value changes |
Affected Issues 0005623 |
|
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.h | Diff File |