Source Control Integration - The Dark Mod Bugtracker

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
master 54b38fe9 16.06.2021 03:42 greebo Details Diff	0005643: Another test covering primitive handling of func_static entities	Affected Issues 0005643
	mod - libs/scene/merge/ThreeWayMergeOperation.cpp	Diff File
	mod - test/MapMerging.cpp	Diff File
	mod - test/algorithm/Scene.h	Diff File
	add - test/resources/tdm/maps/threeway_merge_source_2.mapx	Diff File
	add - test/resources/tdm/maps/threeway_merge_target_2.mapx	Diff File
master cb185f94 15.06.2021 19:47 orbweaver Details Diff	Add test for NPOT DDS texture loading Load a 10x16 uncompressed DDS file and examine pixel data. This test passes, indicating that there isn't a fundamental inability to load NPOT DDS textures.
	mod - test/ImageLoading.cpp	Diff File
	add - test/resources/tdm/textures/dds/test_10x16_uncomp.dds	Diff File
master 15b74d5c 15.06.2021 19:31 orbweaver Details Diff	Test compressed DDS loading Fix the DDSImage::isPrecompressed() method so it returns the correct result for uncompressed images (which is already known internally) rather than incorrectly assuming every DDS file is compressed. This method is now used in tests to distinguish between compressed and uncompressed images.
	mod - radiantcore/imagefile/dds.cpp	Diff File
	mod - test/ImageLoading.cpp	Diff File
	add - test/resources/tdm/textures/dds/test_128x128_dxt1.dds	Diff File
master 8ddcae8c 15.06.2021 19:13 orbweaver Details Diff	Add test for DDS mipmap loading Add a new method Image::getLevels() which returns the number of mipmap levels in a given image. Use this to confirm the expected number of levels when loading DDS images with/without mipmaps.
	mod - include/iimage.h	Diff File
	mod - libs/RGBAImage.h	Diff File
	mod - radiantcore/imagefile/dds.cpp	Diff File
	mod - test/ImageLoading.cpp	Diff File
	add - test/resources/tdm/textures/dds/test_16x16_uncomp_mips.dds	Diff File
master 3efa9b83 15.06.2021 19:09 greebo Details Diff	0005643: Add the only seemingly trivial test which performs a three-way merge with the same map used as source and target. Fixup the implementation to get a green test result.	Affected Issues 0005643
	mod - libs/scene/merge/ComparisonResult.h	Diff File
	mod - libs/scene/merge/GraphComparer.cpp	Diff File
	mod - libs/scene/merge/ThreeWayMergeOperation.cpp	Diff File
	mod - test/MapMerging.cpp	Diff File
master f42738e0 15.06.2021 18:55 orbweaver Details Diff	Streamline pixel examination in unit test Introduce a new Pixelator helper class which retrieves individual pixels from an Image using X and Y coordinates, casting the result to a suitable pixel struct.
	mod - test/ImageLoading.cpp	Diff File
master 0c2b0d0f 15.06.2021 16:04 greebo Details Diff	0005643: Non-conflicting changes mostly covered	Affected Issues 0005643
	mod - test/MapMerging.cpp	Diff File
master c1fa2516 15.06.2021 11:04 greebo Details Diff	0005643: Test covering spawnarg modifications	Affected Issues 0005643
	mod - test/MapMerging.cpp	Diff File
master 11ca5a5d 15.06.2021 10:50 greebo Details Diff	0005643: Fix implementation for merging primitive changes into the target map	Affected Issues 0005643
	mod - libs/scene/merge/MergeOperation.cpp	Diff File
	mod - libs/scene/merge/MergeOperation.h	Diff File
	mod - libs/scene/merge/MergeOperationBase.cpp	Diff File
	mod - libs/scene/merge/MergeOperationBase.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

Changesets: DarkRadiant