Changesets: DarkRadiant
merge_groups 85c23db5 05.06.2021 19:00 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 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 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 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 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 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 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 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 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 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 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 | ||
merge_groups 7d4de868 04.06.2021 13:17 Details Diff |
0005638: Selection Group comparison of all entities that are fully matching up otherwise |
Affected Issues 0005638 |
|
mod - libs/scene/merge/GraphComparer.cpp | Diff File | ||
mod - test/MapMerging.cpp | Diff File | ||
merge_groups e9066be7 04.06.2021 06:48 Details Diff |
0005638: Unit test checking the member difference detection |
Affected Issues 0005638 |
|
mod - test/MapMerging.cpp | Diff File | ||
merge_groups e2648161 04.06.2021 06:38 Details Diff |
0005638: Unit test assuming the node ordering within a group doesn't make a difference |
Affected Issues 0005638 |
|
mod - test/MapMerging.cpp | Diff File | ||
merge_groups 3f0bfbcd 04.06.2021 05:10 Details Diff |
Improve the PortableMapReader implementation to properly fill in the selection groups before the nodes are inserted into the scene root. A snippet in Node::onInsertIntoScene took care of notifying the parent groups of the node membership, but this is not happening when loading the map just in a standalone MapResource, like in the merging scenario. Add unit tests covering that this is actually working now. |
||
mod - radiantcore/map/format/portable/PortableMapReader.cpp | Diff File | ||
mod - test/MapSavingLoading.cpp | Diff File | ||
mod - test/algorithm/Scene.h | Diff File | ||
merge_groups 6623fa28 04.06.2021 04:34 Details Diff |
0005638: Fix test method performComparison always using the same map... copy & paste error |
Affected Issues 0005638 |
|
mod - test/MapMerging.cpp | Diff File | ||
add - test/resources/tdm/maps/merging_groups_1.mapx | Diff File | ||
merge_groups 62270d5e 03.06.2021 19:33 Details Diff |
0005638: Start working on group difference algorithm |
Affected Issues 0005638 |
|
mod - libs/scene/merge/ComparisonResult.h | Diff File | ||
mod - libs/scene/merge/GraphComparer.cpp | Diff File | ||
mod - libs/scene/merge/GraphComparer.h | Diff File | ||
master 064394ff 02.06.2021 20:11 Details Diff |
0005623: Fix linux build, since "None" seems to point to some numeric #define in an X-related header |
Affected Issues 0005623 |
|
mod - include/imapmerge.h | Diff File | ||
mod - radiantcore/map/MergeActionNode.cpp | Diff File | ||
master 2561a754 02.06.2021 19:53 Details Diff |
Improve icon visibility in dark themes Increase luminosity of translate, rotate and clipper tool icons (avoiding black) so that they are reasonably visible in both light and dark themes. |
||
mod - install/bitmaps/select_mouserotate.png | Diff File | ||
mod - install/bitmaps/select_mousetranslate.png | Diff File | ||
mod - install/bitmaps/view_clipper.png | Diff File | ||
master 97050229 02.06.2021 19:51 Details Diff |
0005623: Fix inherited properties having a big red block next to them when in merge mode |
Affected Issues 0005623 |
|
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
master 76372282 02.06.2021 19:51 Details Diff |
Adjust VC++ projects and fix compilation errors | ||
mod - radiant/ui/PointFileChooser.cpp | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/PointFile.cpp | Diff File | ||
mod - radiantcore/model/picomodel/PicoModelModule.h | Diff File | ||
mod - tools/msvc/DarkRadiant.vcxproj | Diff File | ||
mod - tools/msvc/DarkRadiant.vcxproj.filters | Diff File | ||
mod - tools/msvc/Tests/Tests.vcxproj | Diff File | ||
mod - tools/msvc/Tests/Tests.vcxproj.filters | Diff File | ||
mod - tools/msvc/scenelib.vcxproj | Diff File | ||
mod - tools/msvc/scenelib.vcxproj.filters | Diff File | ||
master 7cd838ce 02.06.2021 19:36 Details Diff |
Tweak console text colours for better visibility Avoid using forced black for regular text, since this is unreadable in dark themes. Use wxNullColour for regular text, which uses the appropriate theme colour, and a slightly dark orange for warning text, which appears to be visible with both a light and a dark background. |
||
mod - libs/wxutil/ConsoleView.cpp | Diff File | ||
master 3112676f 02.06.2021 19:34 Details Diff |
Merge remote-tracking branch 'remotes/orbweaver/master' # Conflicts: # include/imap.h # radiant/ui/UserInterfaceModule.cpp # radiant/ui/einspector/EntityInspector.cpp # radiantcore/map/Map.cpp # radiantcore/map/Map.h |
||
mod - include/imap.h | Diff File | ||
mod - install/menu.xml | Diff File | ||
add - libs/scene/PointTrace.h | Diff File | ||
mod - radiant/CMakeLists.txt | Diff File | ||
add - radiant/ui/PointFileChooser.cpp | Diff File | ||
add - radiant/ui/PointFileChooser.h | Diff File | ||
mod - radiant/ui/UserInterfaceModule.cpp | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.cpp | 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 | ||
mod - test/CMakeLists.txt | Diff File | ||
add - test/PointTrace.cpp | Diff File | ||
add - test/resources/tdm/maps/altar.lin | Diff File | ||
add - test/resources/tdm/maps/altar_portalL_544_64_112.lin | Diff File | ||
master 8af189c4 02.06.2021 19:08 Details Diff |
0005623: The changes made to the map while starting the merge operation are undoable now too |
Affected Issues 0005623 |
|
mod - radiantcore/map/Map.cpp | Diff File | ||
master 79d4dcdf 02.06.2021 19:06 Details Diff |
0005623: Fix crash when hitting undo twice after removing some merge actions and completing the operation |
Affected Issues 0005623 |
|
mod - include/imapmerge.h | Diff File | ||
mod - radiantcore/map/MergeActionNode.cpp | Diff File | ||
mod - radiantcore/map/MergeActionNode.h | Diff File |