Changesets: DarkRadiant
|
master a4754991 01.07.2021 16:50 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 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 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 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 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 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 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 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 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 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 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 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 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 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 | ||
|
master ff9f5c55 25.06.2021 05:24 Details Diff |
0005651: Fix crash when using Reloading Defs after placing an Entity |
Affected Issues 0005651 |
|
| mod - libs/wxutil/EntityClassChooser.cpp | Diff File | ||
| mod - libs/wxutil/EntityClassChooser.h | Diff File | ||
|
master 0708444b 25.06.2021 04:41 Details Diff |
0005557: Show "Choose entity..." button for all def_ spawnargs |
Affected Issues 0005557 |
|
| mod - include/version.h | Diff File | ||
| mod - install/games/darkmod.game | Diff File | ||
| mod - install/games/doom3.game | Diff File | ||
|
master 9ad6d397 24.06.2021 19:30 Details Diff |
0005649: Use the third component of the workzone origin to fill in the missing component when placing the camera using Ctrl-MMB |
Affected Issues 0005649 |
|
| mod - radiant/xyview/tools/CameraMoveTool.h | Diff File | ||
|
master 899479b6 24.06.2021 18:28 Details Diff |
0005650: Add "Show Material Definition" option to the Model Selector material list. |
Affected Issues 0005650 |
|
| mod - radiant/ui/common/ShaderSelector.cpp | Diff File | ||
| mod - radiant/ui/modelselector/MaterialsList.cpp | Diff File | ||
| mod - radiant/ui/modelselector/MaterialsList.h | Diff File | ||
|
master c93b97b9 24.06.2021 18:20 Details Diff |
0005650: Add "Show Material Definition" option to regular ShaderSelector tree view. |
Affected Issues 0005650 |
|
| mod - radiant/ui/common/ShaderSelector.cpp | Diff File | ||
| mod - radiant/ui/common/ShaderSelector.h | Diff File | ||
|
master edaabe88 24.06.2021 18:02 Details Diff |
0005643: Scroll the text entry box to the last position, to show the map file name when picking an absolute map path. |
Affected Issues 0005643 |
|
| mod - libs/wxutil/PathEntry.cpp | Diff File | ||
|
master 19ab4ed4 24.06.2021 17:53 Details Diff |
0005643: User will be asked if the merge should be cancelled before closing the control dialog. |
Affected Issues 0005643 |
|
| mod - libs/wxutil/window/TransientWindow.h | Diff File | ||
| mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
| mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
|
master c5c1d4d1 24.06.2021 14:34 Details Diff |
0005643: Improve dialog control behaviour when toggling between merge modes |
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 c063fcbd 24.06.2021 13:25 Details Diff |
0005643: Add mode toggle buttons to the merge control dialog |
Affected Issues 0005643 |
|
| add - install/bitmaps/three_way_merge.png | Diff File | ||
| add - install/bitmaps/two_way_merge.png | 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 - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
|
master bdab773e 24.06.2021 10:32 Details Diff |
0005643: Remove tons of unneeded code |
Affected Issues 0005643 |
|
| mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
|
master 4c732b32 24.06.2021 10:21 Details Diff |
0005643: Finished implementation for handling modified source layers |
Affected Issues 0005643 |
|
| mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
