Changesets: DarkRadiant

master bbbe4dc0

03.07.2021 12:14

greebo


Details Diff
0005643: Make sure func_* entities that are inserted for merge preview purposes are keeping their model and name spawnargs synced. Affected Issues
0005643
mod - libs/scene/merge/MergeAction.h Diff File
mod - libs/scene/merge/MergeActionNode.cpp Diff File
mod - libs/scene/merge/MergeLib.h Diff File

master c34710e3

03.07.2021 12:01

greebo


Details Diff
0005643: Ensure that adding func_* entities from the source scene keeps the "model"=="name" equality intact.
Move some classes to scenelib.
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/CMakeLists.txt Diff File
mod - libs/scene/merge/MergeAction.h Diff File
mod - libs/scene/merge/MergeLib.h Diff File
mod - libs/scene/merge/MergeOperationBase.cpp Diff File
mod - libs/scene/merge/MergeOperationBase.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/map/Map.cpp Diff File
mod - radiantcore/map/Map.h Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

master 9a8ed7c7

03.07.2021 05:41

greebo


Details Diff
0005643: Extend IConflictResolutionAction to be able to access both (source and target) entities. Affected Issues
0005643
mod - include/imapmerge.h Diff File
mod - libs/scene/merge/MergeAction.h Diff File
mod - libs/scene/merge/MergeLib.h Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - test/MapMerging.cpp Diff File

master 2ee17a8c

03.07.2021 04:35

greebo


Details Diff
0005643: Move lots of scene-related algorithm to scene/merge/MergeLib.h. Start adding a way to resolve entity conflicts by keeping both versions. Affected Issues
0005643
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc Diff File
add - libs/scene/merge/MergeLib.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - radiant/ui/merge/MergeControlDialog.h Diff File
mod - radiantcore/map/MergeActionNode.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

master 9f8ca637

02.07.2021 17:50

greebo


Details Diff
0005643: Fix crash when test-selecting a patch removal merge action node Affected Issues
0005643
mod - radiantcore/patch/PatchNode.cpp Diff File

master 149528a0

02.07.2021 17:33

greebo


Details Diff
0005643: Don't allow selection cloning when in merge mode Affected Issues
0005643
mod - radiantcore/selection/algorithm/Transformation.cpp Diff File

master b453c894

02.07.2021 16:02

greebo


Details Diff
0005660: Fix ConsoleView taking ages to catch up with adding buffered log lines to the text control. Affected Issues
0005660
mod - libs/wxutil/ConsoleView.cpp Diff File

master e2bd362d

02.07.2021 15:49

greebo


Details Diff
0005660: Avoid tens of thousands of reallocations of the Face/FaceInstance vectors when parsing brushes Affected Issues
0005660
mod - radiantcore/brush/Brush.cpp Diff File
mod - radiantcore/brush/BrushNode.cpp Diff File
mod - radiantcore/brush/FaceInstance.h Diff File

master 4f9fd03f

02.07.2021 05:15

greebo


Details Diff
0005660: Queue the redraw in the idle event after the current activity is finished. This avoids dispatching thousands of wxWidget::Refresh() calls during map load. Affected Issues
0005660
mod - radiant/camera/CamWnd.cpp Diff File
mod - radiant/camera/CamWnd.h Diff File
mod - radiant/xyview/XYWnd.cpp Diff File
mod - radiant/xyview/XYWnd.h Diff File

master 9df337b2

01.07.2021 17:33

greebo


Details Diff
0005660: The flexibility of being able to define the name of the "name" entity key in the .game file is not worth the performance cost. Affected Issues
0005660
mod - install/games/darkmod.game Diff File
mod - install/games/doom3-demo.game Diff File
mod - install/games/doom3.game Diff File
mod - install/games/prey.game Diff File
mod - install/games/quake3.game Diff File
mod - install/games/quake4.game Diff File
mod - install/games/xreal.game Diff File
mod - radiantcore/entity/NamespaceManager.cpp Diff File

master ddea62a0

01.07.2021 17:03

greebo


Details Diff
Fix release build
mod - libs/debugging/gl.h Diff File

master a4754991

01.07.2021 16:50

greebo


Details Diff
Merge remote-tracking branch 'remotes/orbweaver/master'
mod - include/iimage.h Diff File
mod - libs/RGBAImage.h Diff File
mod - libs/debugging/gl.h Diff File
mod - libs/wxutil/window/TransientWindow.cpp Diff File
mod - libs/wxutil/window/TransientWindow.h Diff File
mod - radiantcore/imagefile/dds.cpp Diff File
mod - test/ImageLoading.cpp Diff File
add - test/resources/tdm/textures/dds/test_10x16_uncomp.dds Diff File
add - test/resources/tdm/textures/dds/test_128x128_dxt1.dds Diff File
add - test/resources/tdm/textures/dds/test_16x16_uncomp_mips.dds Diff File
add - test/resources/tdm/textures/dds/test_60x128_dxt5.dds Diff File
add - test/resources/tdm/textures/dds/test_60x128_dxt5_mips.dds Diff File

master 02127bd8

01.07.2021 16:45

greebo


Details Diff
0005643: Cut down the time it takes to create the three-way merge operation Affected Issues
0005643
mod - libs/math/Hash.h Diff File
mod - libs/scene/merge/ComparisonResult.h Diff File
mod - libs/scene/merge/GraphComparer.cpp Diff File
mod - libs/scene/merge/GraphComparer.h Diff File
mod - test/MapMerging.cpp Diff File

master 02ff8706

30.06.2021 20:10

orbweaver


Details Diff
Remove CallSuper anti-pattern from TransientWindow

_preShow(), _preHide() and friends are now strictly optional methods which
subclasses can override, but do not contain any common TransientWindow code
like saving/loading window positions. This avoids the need for every
TransientWindow subclass to remember to call the parent method before adding
its own code.
mod - libs/wxutil/window/TransientWindow.cpp Diff File
mod - libs/wxutil/window/TransientWindow.h Diff File

master b0a6c533

30.06.2021 20:01

orbweaver


Details Diff
Fix inspector windows appearing disabled on GTK

For some reason the wxFRAME_TOOL_WINDOW style causes inspector windows to
appear without taking focus, which gives the impression that they are disabled
until specifically clicked on.

The wxFRAME_TOOL_WINDOW style is now only used on Windows, where it is
apparently needed to resolve minimisation issues.
mod - libs/wxutil/window/TransientWindow.cpp Diff File
mod - libs/wxutil/window/TransientWindow.h Diff File

master dbcaf845

29.06.2021 19:08

orbweaver


Details Diff
Fix mipmap block size calculation for DDS textures

Unlike the mipmap dimension calculation (which incorrectly rounded up when it
should be doing a simple integer truncation), the block size calculation was
incorrectly rounding down. The new code is more or less copy-pasted from the
TDM codebase, and matches the suggested algorithm documented by Microsoft.

This fixes the inability to upload mipmaps in a 60x128 DXT5 test texture.
mod - radiantcore/imagefile/dds.cpp Diff File

master c52cfae1

29.06.2021 18:47

orbweaver


Details Diff
Fix mipmap size calculation for NPoT textures

Information online and in the TDM codebase indicates that mipmap dimensions
follow a simple integer division sequence, with an extra check to ensure that
each dimension is at least 1. The previous code added 1 before dividing by 2,
which gave wrong results for odd numbers (15 should divide to 7, not 8).

The unit test for NPoT DXT5 now confirms that mipmap sizes are correct and
match the observed mipmap sizes generated by the GIMP DDS exporter. However
this in itself does not fix the uploading to OpenGL of such textures in the
main application, which continues to give GL_INVALID_VALUE after uploading the
second mipmap.
mod - radiantcore/imagefile/dds.cpp Diff File
mod - test/ImageLoading.cpp Diff File

master d13fd481

26.06.2021 18:16

greebo


Details Diff
0005408: Work around running into a crash due to the ModelPreview scenegraph pushing undoables to the global undo operation stack.
If the calling code of EntityClassChooser::chooseEntityClass() creates an UndoableCommand before the call, all manipulations of the ModelPreview scene go to that active UndoOperation. When trying to undo that, the nodes in question have long been deleted and the restoreSnapshot method provokes a crash.
Affected Issues
0005408
mod - include/version.h Diff File
mod - radiant/ui/ortho/OrthoContextMenu.cpp Diff File

master d34e48f2

25.06.2021 17:35

greebo


Details Diff
0005561: Refresh entity inspector after defs have been reloaded Affected Issues
0005561
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.h Diff File

master 5ac84342

25.06.2021 16:57

greebo


Details Diff
0005107: Simplify a few things. Block callbacks right from the start, since the resolveInheritance and applyColours methods are also triggering change signals. Affected Issues
0005107
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File

master 3d9251dc

25.06.2021 16:49

greebo


Details Diff
0005107: Add option to ThreadedDefLoader to invoke a function when the actual worker thread is done (or as good as done). Affected Issues
0005107
mod - libs/ThreadedDefLoader.h Diff File
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File

master fd30a033

25.06.2021 12:19

greebo


Details Diff
0005107: Block the changed signal until parsing is done. When the signal is fired, we must be ready to serve queries to entity classes or model defs without deadlocking in our own ongoing parsing thread.
The change signal is buffered, and should be fired once parsing is done.
Affected Issues
0005107
mod - libs/ThreadedDefLoader.h Diff File
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File
mod - radiantcore/eclass/EntityClass.h Diff File

master 8a5542c3

25.06.2021 10:32

greebo


Details Diff
0005107: Prevent the renderer getting into the way of DEF parsing (or vice versa). Block screen updates until the DEFs are fully loaded.
Now with this change, the deadlock problem as reported in the issue 5107 is occurring in a resonably large map. This has to be fixed seperately.
Affected Issues
0005107
mod - include/ieclass.h Diff File
mod - radiant/ui/mainframe/MainFrame.cpp Diff File
mod - radiant/ui/mainframe/MainFrame.h Diff File
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File

master 66d439b1

25.06.2021 08:18

greebo


Details Diff
0005652: Fix EntityClass::parseFromTokens failing to assign the locally defined attributes on re-parse. Affected Issues
0005652
mod - radiantcore/eclass/EntityClass.cpp Diff File

master 9125554e

25.06.2021 08:07

greebo


Details Diff
0005652: Add test checking the faulty behaviour Affected Issues
0005652
mod - test/Entity.cpp Diff File
add - test/resources/tdm/def/bucket.def Diff File
 First  Prev  1 2 3 ... 30 ... 60 ... 90 ... 119 120 121 122 123 124 125 ... 150 ... 180 ... 210 ... 240 ... 264 265 266  Next  Last