Changesets: DarkRadiant
merge_visualisation d9449b3a 30.05.2021 06:21 Details Diff |
0005623: Hide the base map selector for the moment being |
Affected Issues 0005623 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
merge_visualisation 61937d02 30.05.2021 06:20 Details Diff |
0005623: Fix a crash during map change after removing an action and aborting the merge, due to strong references held by the merge action nodes (in the redo stack). |
Affected Issues 0005623 |
|
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
merge_visualisation ba639437 30.05.2021 05:54 Details Diff |
0005623: Reorganise the MergeActionNodes, introducing two specialisations of the common MergeActionNodeBase. One is aimed to handle entity key value changes targeting the same node, the other one is handling all other action types. |
Affected Issues 0005623 |
|
mod - radiantcore/CMakeLists.txt | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
add - radiantcore/map/MergeActionNode.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
mod - tools/msvc/DarkRadiantCore.vcxproj | Diff File | ||
mod - tools/msvc/DarkRadiantCore.vcxproj.filters | Diff File | ||
merge_visualisation 17841e38 30.05.2021 03:55 Details Diff |
0005623: PatchNode::testSelect doesn't need to protect itself when the node is hidden, this is handled by the caller, e.g. SceneGraph::forEachVisibleNodeInVolume |
Affected Issues 0005623 |
|
mod - radiantcore/patch/PatchNode.cpp | Diff File | ||
merge_visualisation 7d4a9546 29.05.2021 17:14 Details Diff |
0005623: Don't allow MergeActionNodes from being hidden or excluded |
Affected Issues 0005623 |
|
mod - include/inode.h | Diff File | ||
mod - libs/scene/Node.cpp | Diff File | ||
mod - libs/scene/Node.h | Diff File | ||
mod - libs/scenelib.h | Diff File | ||
mod - radiantcore/layers/LayerManager.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
mod - radiantcore/map/RegionWalkers.h | Diff File | ||
mod - radiantcore/selection/algorithm/General.cpp | Diff File | ||
merge_visualisation 9456ff55 29.05.2021 16:26 Details Diff |
0005623: Ensure worldspawn node before merging into an empty map. Remember dialog position. |
Affected Issues 0005623 |
|
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
merge_visualisation 1d5b6fb3 29.05.2021 15:51 Details Diff |
0005623: Gracefully remove the merge action nodes from the scene without changing the action's status by their removal. |
Affected Issues 0005623 |
|
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
merge_visualisation 880df6c8 29.05.2021 15:42 Details Diff |
0005623: Use excluded flag to not interfere with the user hiding/unhiding nodes during merge |
Affected Issues 0005623 |
|
mod - libs/scene/Node.h | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
merge_visualisation ffb6f870 29.05.2021 14:55 Details Diff |
0005632: Catch exceptions thrown by actions | ||
mod - libs/scene/merge/MergeOperation.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
merge_visualisation a8bee018 29.05.2021 14:39 Details Diff |
0005623: Unit test covering deactivated merge actions. |
Affected Issues 0005623 |
|
mod - test/MapMerging.cpp | Diff File | ||
merge_visualisation 0ebf036b 29.05.2021 14:04 Details Diff |
0005623: Merge action nodes automatically set the active/inactive state of the encapsulated actions when they are inserted into or removed from the scene, respectively. |
Affected Issues 0005623 |
|
mod - include/imergeaction.h | Diff File | ||
mod - libs/scene/merge/MergeAction.h | Diff File | ||
mod - libs/scene/merge/MergeOperation.h | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
merge_visualisation bbd04668 29.05.2021 11:51 Details Diff |
0005623: Build fix |
Affected Issues 0005623 |
|
mod - radiant/xyview/XYRenderer.h | Diff File | ||
merge_visualisation a600afb3 29.05.2021 11:45 Details Diff |
0005623: Reject / Finish buttons wired up to the respective functions. Reject algorithm is already working. |
Affected Issues 0005623 |
|
mod - include/imap.h | Diff File | ||
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 | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
merge_visualisation 796ba28a 29.05.2021 10:39 Details Diff |
0005623: Merge Control Dialog is listening to selection changes now (but not reacting yet). Don't draw size info in merge mode. |
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 | ||
mod - radiant/xyview/XYWnd.cpp | Diff File | ||
merge_visualisation e08f1c3c 29.05.2021 08:55 Details Diff |
0005623: Rendering of selected merge action nodes |
Affected Issues 0005623 |
|
mod - include/iglrender.h | Diff File | ||
mod - radiant/xyview/XYRenderer.h | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp | Diff File | ||
merge_visualisation 69e0f518 29.05.2021 08:35 Details Diff |
0005623: Working on merge control dialog. The "merge map" menu item now opens the transient window where users can choose a map and launch the comparison/merge. |
Affected Issues 0005623 |
|
mod - include/imap.h | Diff File | ||
add - install/bitmaps/merge_arrow.png | Diff File | ||
add - install/bitmaps/merge_fork.png | Diff File | ||
rm - install/bitmaps/merge_path.png | Diff | ||
mod - install/menu.xml | Diff File | ||
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 | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
merge_visualisation b5f17790 29.05.2021 05:18 Details Diff |
0005623: Scene removal of MergeActionNodes. |
Affected Issues 0005623 |
|
mod - radiantcore/map/MergeActionNode.h | Diff File | ||
mod - radiantcore/selection/SelectionTestWalkers.cpp | Diff File | ||
merge_visualisation c0ab4db8 29.05.2021 04:17 Details Diff |
0005623: Start working on a merge control dialog |
Affected Issues 0005623 |
|
add - install/bitmaps/merge_path.png | Diff File | ||
add - install/ui/mergecontroldialog.fbp | Diff File | ||
add - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - radiant/CMakeLists.txt | Diff File | ||
mod - radiant/ui/UserInterfaceModule.cpp | Diff File | ||
add - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
add - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
mod - tools/msvc/DarkRadiant.vcxproj | Diff File | ||
mod - tools/msvc/DarkRadiant.vcxproj.filters | Diff File | ||
merge_visualisation 756bddaa 28.05.2021 15:16 Details Diff |
0005623: Fix crashing the EntityInspector when a non-entity is selected below the root node |
Affected Issues 0005623 |
|
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
merge_visualisation 130b1e90 28.05.2021 15:02 Details Diff |
0005623: Add specialised Selector class for merge action mode |
Affected Issues 0005623 |
|
mod - radiantcore/selection/RadiantSelectionSystem.cpp | Diff File | ||
mod - radiantcore/selection/SelectionTestWalkers.cpp | Diff File | ||
mod - radiantcore/selection/SelectionTestWalkers.h | Diff File | ||
merge_visualisation 0f318918 28.05.2021 03:45 Details Diff |
0005623: Merge Action Selection Mode (non-functional) |
Affected Issues 0005623 |
|
mod - include/iselection.h | Diff File | ||
add - install/bitmaps/merge_selection_mode.png | Diff File | ||
mod - install/user.xml | Diff File | ||
mod - radiant/ui/SelectionModeToggle.h | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp | Diff File | ||
mod - radiantcore/selection/RadiantSelectionSystem.cpp | Diff File | ||
mod - radiantcore/selection/RadiantSelectionSystem.h | Diff File | ||
master bd647ef4 26.05.2021 19:30 Details Diff |
Only show PointFileChooser when making trace visible Visibility of current trace is exposed through a new method isPointTraceVisible() on the IMap interface. This method is now used by PointFileChooser to avoid showing the dialog when hiding the point trace. |
Affected Issues 0005603 |
|
mod - include/imap.h | Diff File | ||
mod - radiant/ui/PointFileChooser.cpp | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
master 771a105c 26.05.2021 19:21 Details Diff |
Move PointFile into the Map module The point file is closely associated with the current map, and does not really benefit from being a module in its own right. Making it a member variable of the Map module opens the door to exposing current pointfile state through the IMap public interface. |
Affected Issues 0005603 |
|
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 78202540 26.05.2021 18:27 Details Diff |
0005623: Fix a resource leak due to the MergeActionNodes not being freed until shutdown |
Affected Issues 0005623 |
|
mod - radiantcore/map/Map.cpp | Diff File | ||
merge_visualisation 8b2605ff 26.05.2021 17:36 Details Diff |
0005623: Some map handling fixes to make it stop crashing |
Affected Issues 0005623 |
|
mod - libs/UndoFileChangeTracker.h | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
mod - radiantcore/map/MapResource.cpp | Diff File |