Changesets: DarkRadiant

merge_layers c7ebb3aa

07.06.2021 04:00

greebo


Details Diff
0005639: Expand tests against the merge operation flags Affected Issues
0005639
mod - test/MapMerging.cpp Diff File

merge_layers 1f55a9fd

07.06.2021 03:52

greebo


Details Diff
0005639: Untested imeplementation of LayerMerger Affected Issues
0005639
mod - libs/scene/merge/LayerMerger.h Diff File

merge_layers 7f74453a

07.06.2021 03:24

greebo


Details Diff
0005639: Start implementing the LayerMerger. Affected Issues
0005639
mod - libs/scene/merge/LayerMerger.h Diff File
mod - libs/scene/merge/NodeUtils.h Diff File

merge_layers fafd8a6a

07.06.2021 03:12

greebo


Details Diff
0005639: Test covering renaming of layers (plus modification) Affected Issues
0005639
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_layers_5.mapx Diff File

merge_layers 673b7d9b

06.06.2021 18:53

greebo


Details Diff
0005639: Test covering removal of layers, but with kept nodes (as decided by the user) Affected Issues
0005639
mod - include/imapmerge.h Diff File
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_layers_4.mapx Diff File

merge_layers f9631519

06.06.2021 11:14

greebo


Details Diff
0005639: Removal of layers Affected Issues
0005639
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_layers_3.mapx Diff File

merge_layers be4e5878

06.06.2021 11:10

greebo


Details Diff
0005639: Unit test covering the addition of new layers which were missing in the base map Affected Issues
0005639
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_layers_2.mapx Diff File

merge_layers ed0a3cd0

06.06.2021 07:09

greebo


Details Diff
0005639: Start creating the infrastructure to merge layers and test the algorithm Affected Issues
0005639
add - libs/scene/merge/LayerMerger.h Diff File
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_layers_1.mapx Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

master f1e1b30e

06.06.2021 05:06

greebo


Details Diff
0005623: Add IMap::signal_editModeChanged to get notified on edit mode changes. The MergeControlDialog needs to monitor that mode and adjust its UI state. Affected Issues
0005623
mod - include/imap.h 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

master 521f972a

06.06.2021 04:24

greebo


Details Diff
0005623: Adjust getNodeName() method to support the recently introduced MergeAction node type Affected Issues
0005623
mod - libs/debugging/ScenegraphUtils.h Diff File

master 16a0abc9

06.06.2021 04:15

greebo


Details Diff
Extend Map Script Interface by point file and merge edit mode methods. Also include GlobalMap.getRoot since that's useful too.
mod - install/scripts/test.py Diff File
mod - plugins/script/interfaces/MapInterface.cpp Diff File
mod - plugins/script/interfaces/MapInterface.h Diff File

master 9ec9971d

06.06.2021 03:58

greebo


Details Diff
Tweak dialog default height
mod - include/version.h Diff File
mod - install/user.xml Diff File

merge_groups 80f054e3

06.06.2021 03:50

greebo


Details Diff
0005638: Add a test covering the MergeOperation flag to include selection groups Affected Issues
0005638
mod - test/MapMerging.cpp Diff File

merge_groups 73fa88cd

05.06.2021 19:10

greebo


Details Diff
0005638: Make summary panel insensitive when no merge is active Affected Issues
0005638
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File

merge_groups 85c23db5

05.06.2021 19:00

greebo


Details Diff
0005638: Tests for keeping group links alive between nodes that have been chosen by the user to be kept during merge.
The groups are kept intact as far as it is only affecting base-exclusive nodes, all links to nodes that are present in the source map too are cut off.
Affected Issues
0005638
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_groups_6.mapx Diff File

merge_groups 14e962b7

05.06.2021 18:18

greebo


Details Diff
0005638: Tests for merging new entities with grouping Affected Issues
0005638
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_groups_5.mapx Diff File

merge_groups b73da854

05.06.2021 16:03

greebo


Details Diff
0005638: Tests for basic merge scenarios Affected Issues
0005638
mod - libs/scene/merge/SelectionGroupMerger.h Diff File
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_groups_3.mapx Diff File
add - test/resources/tdm/maps/merging_groups_4.mapx Diff File

merge_groups 9cbc1a07

05.06.2021 11:26

greebo


Details Diff
0005638: Start fleshing out the unit tests to validate the selection group merge behaviour Affected Issues
0005638
mod - libs/scene/merge/SelectionGroupMerger.h Diff File
mod - test/MapMerging.cpp Diff File
add - test/resources/tdm/maps/merging_groups_2.mapx Diff File

merge_groups 5dd4473c

05.06.2021 09:58

greebo


Details Diff
0005638: Log everything that is happening during selection group merge, will need that at least during feature development Affected Issues
0005638
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - libs/scene/merge/NodeUtils.h Diff File
mod - libs/scene/merge/SelectionGroupMerger.h Diff File

merge_groups 6a72e589

05.06.2021 08:42

greebo


Details Diff
0005638: First untested implementation of a SelectionGroupMerger class performing the base scene group adjustment Affected Issues
0005638
mod - libs/scene/merge/GraphComparer.cpp Diff File
mod - libs/scene/merge/MergeOperation.cpp Diff File
add - libs/scene/merge/NodeUtils.h Diff File
add - libs/scene/merge/SelectionGroupMerger.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

merge_groups 1de197a1

04.06.2021 19:44

greebo


Details Diff
Github workflow action should define the build type
mod - .github/workflows/build.yml Diff File

merge_groups 6e8dfc25

04.06.2021 18:19

greebo


Details Diff
0005638: Expose option to merge selection group information in the dialog Affected Issues
0005638
mod - include/imapmerge.h Diff File
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc Diff File
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File

merge_groups a098155a

04.06.2021 17:13

greebo


Details Diff
0005638: More test cases. Change group fingerprint calculation to only look at an entity's name instead of its fingerprint.
For verifying links between entities a matching name is enough.
Affected Issues
0005638
mod - libs/scene/merge/GraphComparer.cpp Diff File
mod - libs/scene/merge/GraphComparer.h Diff File
mod - test/MapMerging.cpp Diff File

merge_groups a1bac311

04.06.2021 16:10

greebo


Details Diff
0005638: Test case of a mismatching entity or its children having different group memberships Affected Issues
0005638
mod - test/MapMerging.cpp Diff File

merge_groups 83066238

04.06.2021 14:46

greebo


Details Diff
0005638: Another test case of a matching entity having different group memberships Affected Issues
0005638
mod - test/MapMerging.cpp Diff File
mod - test/resources/tdm/maps/merging_groups_1.mapx Diff File
 First  Prev  1 2 3 ... 30 ... 60 ... 90 ... 120 121 122 123 124 125 126 127 ... 150 ... 180 ... 210 ... 240 ... 261 262 263  Next  Last