Source Control Integration - The Dark Mod Bugtracker

master dee964f4 21.06.2021 10:48 greebo Details Diff	0005643: Start implementing the 3-way selection group merge algorithm	Affected Issues 0005643
	mod - libs/scene/merge/SelectionGroupMerger.h	Diff File
	add - libs/scene/merge/SelectionGroupMergerBase.h	Diff File
	mod - libs/scene/merge/ThreeWayMergeOperation.cpp	Diff File
	mod - libs/scene/merge/ThreeWayMergeOperation.h	Diff File
	add - libs/scene/merge/ThreeWaySelectionGroupMerger.h	Diff File
	mod - tools/msvc/scenelib.vcxproj	Diff File
	mod - tools/msvc/scenelib.vcxproj.filters	Diff File
master 58dde92a 21.06.2021 08:45 greebo Details Diff	0005643: Add "FocusView" command accepting two vector3 arguments (origin and angles). Implement Jump to next Conflict functionality.	Affected Issues 0005643
	mod - install/ui/mergecontroldialog.fbp	Diff File
	mod - install/ui/mergecontroldialog.xrc	Diff File
	mod - libs/scenelib.h	Diff File
	mod - radiant/ui/entitylist/EntityList.cpp	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
	mod - radiantcore/map/MapPosition.cpp	Diff File
	mod - radiantcore/map/MapPositionManager.cpp	Diff File
master f159b4cd 21.06.2021 04:57 greebo Details Diff	0005643: Notify when there's nothing to merge. Display a description of every single merge action.	Affected Issues 0005643
	mod - include/imapmerge.h	Diff File
	mod - install/ui/mergecontroldialog.fbp	Diff File
	mod - install/ui/mergecontroldialog.xrc	Diff File
	mod - libs/scene/merge/MergeOperationBase.cpp	Diff File
	mod - libs/scene/merge/MergeOperationBase.h	Diff File
	mod - radiant/ui/einspector/EntityInspector.cpp	Diff File
	mod - radiant/ui/merge/MergeControlDialog.cpp	Diff File
	mod - radiantcore/map/Map.cpp	Diff File
master 6f5a0c5d 20.06.2021 17:35 greebo Details Diff	0005643: Some simplifications	Affected Issues 0005643
	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
master 2205cdc9 20.06.2021 17:13 greebo Details Diff	0005643: Fix Linux build	Affected Issues 0005643
	mod - libs/scene/merge/MergeAction.h	Diff File
master a8e3607f 20.06.2021 16:32 greebo Details Diff	0005643: Move code to deactivate the conflict actions (and reject the source change) on removal from scene to the nodes.	Affected Issues 0005643
	mod - radiant/ui/merge/MergeControlDialog.cpp	Diff File
	mod - radiantcore/map/MergeActionNode.cpp	Diff File
	mod - radiantcore/map/MergeActionNode.h	Diff File
master 31ff662f 20.06.2021 16:02 greebo Details Diff	0005643: Share algorithm to deactivate conflict nodes on deletion.	Affected Issues 0005643
	mod - radiant/ui/merge/MergeControlDialog.cpp	Diff File
	mod - radiant/ui/merge/MergeControlDialog.h	Diff File
master d5bdd83f 20.06.2021 15:53 greebo Details Diff	0005643: Conflicts of type "ModificationOfRemovedEntity" transform into AddEntityNodes on accept. To see what's going on, the removed node needs to be added to the target scene for preview purposes.	Affected Issues 0005643
	mod - radiantcore/map/MergeActionNode.cpp	Diff File
	mod - radiantcore/map/MergeActionNode.h	Diff File
master 24cf0227 20.06.2021 07:38 greebo Details Diff	0005643: More conflict UI handling, focusing on functionality only.	Affected Issues 0005643
	mod - install/ui/mergecontroldialog.fbp	Diff File
	mod - install/ui/mergecontroldialog.xrc	Diff File
	mod - radiant/ui/merge/MergeControlDialog.cpp	Diff File
	mod - radiantcore/map/Map.cpp	Diff File
	mod - radiantcore/map/MergeActionNode.cpp	Diff File
master 398f70fe 20.06.2021 06:23 greebo Details Diff	0005643: More conflict resolution logic.	Affected Issues 0005643
	mod - install/ui/mergecontroldialog.fbp	Diff File
	mod - install/ui/mergecontroldialog.xrc	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 - radiant/ui/merge/MergeControlDialog.h	Diff File
master 913de02e 19.06.2021 19:14 greebo Details Diff	0005643: Minor WIP to the control dialog	Affected Issues 0005643
	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
master 2ac47956 19.06.2021 16:34 greebo Details Diff	0005643: Resolved conflict actions that are rejected later should report as deactivated	Affected Issues 0005643
	mod - libs/scene/merge/MergeAction.h	Diff File
master e836dd22 19.06.2021 16:17 greebo Details Diff	0005643: Working on EntityInspector accepting and rejecting conflicting key/value changes and the way the associated nodes are rendered.	Affected Issues 0005643
	mod - include/imapmerge.h	Diff File
	mod - libs/wxutil/dataview/TreeViewItemStyle.h	Diff File
	mod - radiant/ui/einspector/EntityInspector.cpp	Diff File
	mod - radiant/ui/einspector/EntityInspector.h	Diff File
	mod - radiantcore/map/MergeActionNode.cpp	Diff File
	mod - radiantcore/map/MergeActionNode.h	Diff File
master 35770902 19.06.2021 06:46 greebo Details Diff	0005643: Fixup unit tests	Affected Issues 0005643
	mod - test/MapMerging.cpp	Diff File
master 16cd7ea1 19.06.2021 06:44 greebo Details Diff	0005643: More work on visualising conflicts, add some handling code to EntityInspector.	Affected Issues 0005643
	mod - include/imapmerge.h	Diff File
	mod - install/ui/mergecontroldialog.fbp	Diff File
	mod - install/ui/mergecontroldialog.xrc	Diff File
	mod - libs/scene/merge/MergeAction.h	Diff File
	mod - libs/wxutil/dataview/TreeViewItemStyle.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 - test/MapMerging.cpp	Diff File
master 2d21b62a 19.06.2021 06:08 greebo Details Diff	0005643: Expose conflict resolution action interface	Affected Issues 0005643
	mod - include/imapmerge.h	Diff File
	mod - install/ui/mergecontroldialog.fbp	Diff File
	mod - install/ui/mergecontroldialog.xrc	Diff File
	mod - libs/scene/merge/MergeAction.h	Diff File
	mod - radiant/ui/einspector/EntityInspector.cpp	Diff File
	mod - radiant/ui/merge/MergeControlDialog.cpp	Diff File
	mod - test/MapMerging.cpp	Diff File
master 5c8141c0 18.06.2021 19:35 greebo Details Diff	0005643: Render conflict nodes with an orange overlay	Affected Issues 0005643
	mod - include/irenderable.h	Diff File
	mod - libs/render/CamRenderer.h	Diff File
	mod - libs/render/RenderableCollectionWalker.h	Diff File
	mod - radiant/camera/CamWnd.cpp	Diff File
	mod - radiant/xyview/XYRenderer.h	Diff File
	mod - radiant/xyview/XYWnd.cpp	Diff File
	mod - radiantcore/rendersystem/backend/OpenGLShader.cpp	Diff File
master c9684c6f 18.06.2021 18:10 greebo Details Diff	0005643: Start working on the UI part. Extend Map interface to create a three-way merge operation when a base map is available.	Affected Issues 0005643
	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 - radiantcore/map/Map.cpp	Diff File
	mod - radiantcore/map/Map.h	Diff File
master 6217c990 18.06.2021 12:25 greebo Details Diff	0005643: Add tests covering removal of modified spawnargs as well the modification of removed spawnargs	Affected Issues 0005643
	mod - test/MapMerging.cpp	Diff File
	mod - test/resources/tdm/maps/threeway_merge_source_2.mapx	Diff File
	mod - test/resources/tdm/maps/threeway_merge_target_2.mapx	Diff File
master e2fec672 18.06.2021 12:13 greebo Details Diff	0005643: Add a ConflictType enum to be able to specifically tell what a conflict is about. Expand unit tests by some value change conflicts.	Affected Issues 0005643
	mod - include/imapmerge.h	Diff File
	mod - libs/scene/merge/MergeAction.h	Diff File
	mod - libs/scene/merge/ThreeWayMergeOperation.cpp	Diff File
	mod - libs/scene/merge/ThreeWayMergeOperation.h	Diff File
	mod - test/MapMerging.cpp	Diff File
	mod - test/resources/tdm/maps/threeway_merge_source_2.mapx	Diff File
	mod - test/resources/tdm/maps/threeway_merge_target_2.mapx	Diff File
master 23cc9213 18.06.2021 09:12 greebo Details Diff	0005643: Craft the unit test to check the name conflict resolution	Affected Issues 0005643
	mod - test/MapMerging.cpp	Diff File
master 440a55df 18.06.2021 08:34 greebo Details Diff	0005643: Restructure the whole process into two phases. Phase 1 will detect any name conflicts that will occur during merge and will adjust the entity names accordingly (using Namespace algorithms). Phase 2 will create the actions necessary to bring the source changes into the target scene. Start preparing the corresponding unit test.	Affected Issues 0005643
	mod - libs/scene/merge/ThreeWayMergeOperation.cpp	Diff File
	mod - libs/scene/merge/ThreeWayMergeOperation.h	Diff File
	mod - test/MapMerging.cpp	Diff File
	mod - test/resources/tdm/maps/threeway_merge_base.mapx	Diff File
	mod - test/resources/tdm/maps/threeway_merge_source_2.mapx	Diff File
	mod - test/resources/tdm/maps/threeway_merge_target_2.mapx	Diff File
master 0ab693c9 18.06.2021 08:12 greebo Details Diff	0005643: Extend INamespace interface by a method that only covers a subset of the to-be-imported scene.	Affected Issues 0005643
	mod - include/inamespace.h	Diff File
	mod - radiantcore/map/namespace/Namespace.cpp	Diff File
	mod - radiantcore/map/namespace/Namespace.h	Diff File
master 5cd128a4 16.06.2021 06:05 greebo Details Diff	Fix a crash on closing the MaterialEditor due to the connection not being cleared.
	mod - radiant/ui/materials/editor/MaterialEditor.cpp	Diff File
master 17ac50f5 16.06.2021 04:00 greebo Details Diff	0005634: Revert the change that auto-fills the clipboard with the picked material name. It is very unhandy when trying to copy&paste elements between maps.	Affected Issues 0005634
	mod - radiantcore/selection/shaderclipboard/ShaderClipboard.cpp	Diff File

Changesets: DarkRadiant