Changesets: DarkRadiant
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 | ||
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 |