Changesets: DarkRadiant

master f42738e0

2021-06-15 18:55:05

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.
Attach Issues:
mod - test/ImageLoading.cpp Diff File

master 0c2b0d0f

2021-06-15 16:04:32

greebo

Details Diff
0005643: Non-conflicting changes mostly covered Affected Issues
0005643
mod - test/MapMerging.cpp Diff File

master c1fa2516

2021-06-15 11:04:05

greebo

Details Diff
0005643: Test covering spawnarg modifications Affected Issues
0005643
mod - test/MapMerging.cpp Diff File

master 11ca5a5d

2021-06-15 10:50:02

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

master 8bc51096

2021-06-15 09:50:25

greebo

Details Diff
0005643: Verify that the changes to the target scene are preserved before and after the merge Affected Issues
0005643
mod - test/MapMerging.cpp Diff File

master 39f57ac8

2021-06-15 08:10:33

greebo

Details Diff
0005643: Start setting up the unit tests for the three-way merge scenario Affected Issues
0005643
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
add - test/resources/tdm/maps/threeway_merge_base.mapx Diff File
add - test/resources/tdm/maps/threeway_merge_source_1.mapx Diff File
add - test/resources/tdm/maps/threeway_merge_target_1.mapx Diff File

master 33d28ff9

2021-06-15 05:09:37

greebo

Details Diff
0005643: Adjust CMakeLists.txt Affected Issues
0005643
mod - libs/scene/CMakeLists.txt Diff File

master a35d2f29

2021-06-15 05:05:19

greebo

Details Diff
0005643: ConflictResolutionActions apply the changes only if explicitly told so by the client code Affected Issues
0005643
mod - libs/scene/merge/MergeAction.h Diff File

master 3a86bd8d

2021-06-15 04:47:17

greebo

Details Diff
0005643: Handle primitive removals and addition targeting the same entity Affected Issues
0005643
mod - libs/scene/merge/GraphComparer.cpp Diff File
mod - libs/scene/merge/GraphComparer.h Diff File
mod - libs/scene/merge/NodeUtils.h Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File

master 10d3b0ab

2021-06-15 04:14:54

greebo

Details Diff
0005643: Lots of refactorings and bits of implementation. Affected Issues
0005643
mod - include/imapmerge.h Diff File
mod - libs/scene/merge/MergeAction.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

master 26bef51e

2021-06-15 03:15:35

greebo

Details Diff
0005643: Roughly lay out the code paths for the conflict detection code Affected Issues
0005643
mod - libs/scene/merge/GraphComparer.h Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.h Diff File

master 6ea48e27

2021-06-14 15:30:22

greebo

Details Diff
0005643: Introduce MergeOperationBase class to host the shared code Affected Issues
0005643
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
add - libs/scene/merge/MergeOperationBase.cpp Diff File
add - libs/scene/merge/MergeOperationBase.h Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

master 9d08ce23

2021-06-14 14:08:35

greebo

Details Diff
0005635: Set focus on the command entry when the console panel is getting focused Affected Issues
0005635
mod - radiant/log/Console.cpp Diff File
mod - radiant/log/Console.h Diff File

master 359b5009

2021-06-14 13:55:23

greebo

Details Diff
0005643: Add skeleton class representing a three-way merge operation Affected Issues
0005643
mod - libs/scene/CMakeLists.txt Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
add - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
add - libs/scene/merge/ThreeWayMergeOperation.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

master 1a217b09

2021-06-13 11:38:24

greebo

Details Diff
0005635: Add optional Vector3 arguments to SelectInside, SelectFullyInside, SelectCompleteTall and SelectTouching.
This way users can use these commands from the console without having to drag out the selection brushes.
Affected Issues
0005635
mod - radiantcore/selection/algorithm/General.cpp Diff File

master b90f834e

2021-06-13 11:17:46

greebo

Details Diff
0005635: Add "Select Fully Inside" which is discarding items if their bounds are flush with the selection bounds. Affected Issues
0005635
mod - install/menu.xml Diff File
mod - radiantcore/selection/algorithm/General.cpp Diff File
mod - radiantcore/selection/algorithm/SelectionPolicies.h Diff File

master 27b503c5

2021-06-11 15:43:50

greebo

Details Diff
Merge remote-tracking branch 'remotes/orbweaver/master'
Attach Issues:
mod - install/bitmaps/select_mouserotate.png Diff File
mod - install/bitmaps/select_mousetranslate.png Diff File
mod - install/bitmaps/view_clipper.png Diff File
mod - libs/wxutil/ConsoleView.cpp Diff File
mod - plugins/dm.objectives/CMakeLists.txt Diff File
mod - plugins/dm.stimresponse/CMakeLists.txt Diff File
mod - plugins/script/CMakeLists.txt Diff File
mod - radiant/CMakeLists.txt Diff File
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/model/picomodel/PicoModelModule.h Diff File
mod - test/ImageLoading.cpp Diff File
add - test/resources/tdm/textures/dds/test_16x16_uncomp.dds Diff File

master 8ba06267

2021-06-11 10:17:37

greebo

Details Diff
0005642: SoundChooser remembers its size and position Affected Issues
0005642
mod - radiant/ui/common/SoundChooser.cpp Diff File
mod - radiant/ui/common/SoundChooser.h Diff File

master 24ed7531

2021-06-11 10:12:35

greebo

Details Diff
0005642: EntityClassChooser remembers its size and position now Affected Issues
0005642
mod - libs/wxutil/EntityClassChooser.cpp Diff File
mod - libs/wxutil/EntityClassChooser.h Diff File

master 0a2cdfc9

2021-06-11 09:55:46

greebo

Details Diff
0005632: Add the uniform scale toggle button Affected Issues
0005632
mod - install/user.xml Diff File
mod - radiant/ui/texturebrowser/TextureBrowserManager.cpp Diff File

master e030841a

2021-06-11 09:52:55

greebo

Details Diff
0005632: Add a 5% scale option Affected Issues
0005632
mod - install/user.xml Diff File
mod - radiant/ui/texturebrowser/TextureBrowser.cpp Diff File
mod - radiant/ui/texturebrowser/TextureBrowserManager.cpp Diff File

master e91883e9

2021-06-11 09:49:02

greebo

Details Diff
0005632: Revive the code to render texture tiles in a size proportional to their editor image.
The default is still Uniform Texture Size clamped to 128 pixels.
Affected Issues
0005632
mod - install/user.xml Diff File
mod - radiant/ui/texturebrowser/TextureBrowser.cpp Diff File
mod - radiant/ui/texturebrowser/TextureBrowser.h Diff File
mod - radiant/ui/texturebrowser/TextureBrowserManager.cpp Diff File

master 538922fc

2021-06-11 08:38:41

greebo

Details Diff
0005632: Some tweaking to Texture Tile borders and colours Affected Issues
0005632
mod - radiant/ui/texturebrowser/TextureBrowser.cpp Diff File

master 29c5fb38

2021-06-11 06:12:09

greebo

Details Diff
0005634: Add missing header Affected Issues
0005634
mod - radiantcore/selection/clipboard/Clipboard.cpp Diff File

master da81e635

2021-06-11 05:24:43

greebo

Details Diff
0005637: Maximum zoom factor of XY views is now configurable, the default value has been double a few times. Affected Issues
0005637
mod - install/user.xml Diff File
mod - radiant/ui/prefdialog/PrefDialog.cpp Diff File
mod - radiant/xyview/GlobalXYWnd.cpp Diff File
mod - radiant/xyview/GlobalXYWnd.h Diff File
mod - radiant/xyview/XYWnd.cpp Diff File
 First  Prev  1 2 3 ... 5 6 7 8 9 10 11 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 130 ... 140 ... 147 148 149  Next  Last