Merge remote-tracking branch 'remotes/orbweaver/master'

.gitignore

@@ -15,6 +15,12 @@ cmake_install.cmake
 *.la
 .deps
 
+# Linux profiling
+perf.data*
+
+# Doxygen output
+/dox
+
 # Editor temporary files
 *.swp
 tags
@@ -63,11 +69,6 @@ testsuite.ilk
 .DS_Store
 xcuserdata
 
-Makefile.in
-/config.h.in
-/configure
-/ltmain.sh
-/aclocal.m4
 /install/*.zip
 /tools/msvc/.vs
 /tools/msvc/DarkRadiant.VC.db

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 
 # Project name and version
-project(darkradiant VERSION 3.9.0)
+project(darkradiant VERSION 3.9.1)
 
 # C++ standard
 set(CMAKE_CXX_STANDARD 17)
@@ -130,7 +130,7 @@ add_subdirectory(radiant)
 pkg_check_modules(GTEST gtest)
 pkg_check_modules(GTEST_MAIN gtest_main)
 if (${GTEST_FOUND} AND ${GTEST_MAIN_FOUND})
-    include(CTest)
+    enable_testing()
     add_subdirectory(test)
 endif()
 
@@ -143,7 +143,7 @@ else()
 endif()
 
 # Install main targets
-install(TARGETS darkradiant math xmlutil scenegraph wxutil
+install(TARGETS darkradiant math xmlutil scene wxutil
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION ${PKGLIBDIR})
 install(TARGETS radiantcore script sound

debian/changelog

@@ -1,3 +1,26 @@
+darkradiant (3.9.1~jammy1) jammy; urgency=medium
+
+  * Textures with RGTC normal maps no longer show as black in lighting preview
+    mode.
+  * Skin editor no longer crashes when editing the skin name.
+  * Reduced space wastage in Surface Editor.
+  * Several dialogs which could previously be shrunk to zero size no longer do
+    so.
+
+ -- Matthew Mott <[email protected]>  Sat, 25 May 2024 13:10:46 +0100
+
+darkradiant (3.9.0~jammy1) jammy; urgency=medium
+
+  * Add "Show definition" button for the "inherit" spawnarg.
+  * Preserve patch tesselation fixed subdivisions when creating caps.
+  * Add Filters for Location Entities and Player Start.
+  * Support saving entity key/value pairs containing double quotes.
+  * Allow a way to easily see all properties of attached entities.
+  * Ortho views preserve their orientation between sessions.
+  * Various bug fixes and minor improvements.
+
+ -- Matthew Mott <[email protected]>  Tue, 02 Apr 2024 20:26:39 +0100
+
 darkradiant (3.8.0~jammy1) jammy; urgency=medium
 
   * New feature: Support new frob-related material keywords.

doc/manual.adoc

@@ -277,10 +277,10 @@ background image configuration dialog.
 *Use background image*:: Master toggle to show or hide the background image.
 
 *Image file*:: Click on the widget to show a file chooser which allows you to find and
-*select the background image to show.
+select the background image to show.
 
 *Opacity*:: Drag the slider to control the opacity of the image, from fully transparent
-*(invisible) to fully opaque.
+(invisible) to fully opaque.
 
 *Scale*:: Adjusts the size of the image.
 
@@ -889,17 +889,17 @@ to make changes which will be applied uniformly to all selected faces.
 [cols="1h,3"]
 |===
 |Shader|This shows the full name of the texture applied to the selected
-face(s). You can use the folder button to bring up a new dialog which allows you
+face(s). You can use the tree button to bring up a new dialog which allows you
 to choose a new texture.
-|Horiz/Vert Shift|These text boxes show the current texture shift (translation)
+|X/Y Shift|These text boxes show the current texture shift (translation)
 on the horizontal and vertical axes. The associated arrow buttons will increase
 or decrease the texture shift by the current *Step* value.
-|Horiz/Vert Scale|These show the current texture scale in the horizontal and
+|X/Y Scale|These show the current texture scale in the horizontal and
 vertical directions. The arrow buttons will increase or decrease the scale by
 the current *Step* value.
 |Rotation|Shows the current texture rotation, in degrees. The arrow buttons will
 rotate the texture clockwise or anticlockwise by the current *Step* value.
-|Fit Texture|These controls allow you to fit an exact number of copies of the
+|Fit|These controls allow you to fit an exact number of copies of the
 texture across the face, so that the texture edges correspond to the face edges.
 
 The numeric spin boxes control how many copies of the texture are tiled on each
@@ -917,13 +917,22 @@ _widths_ on a certain brush face but the number of _lengths_ is not important
 (since the texture is seamless); in this case, avoiding aspect ratio distortion
 is more useful than fitting an exact number of lengths.
 
-|Align Texture|These buttons shift the texture so that the Top/Bottom/Left/Right
+|
+image:align_top.png[] 
+image:align_bottom.png[] 
+image:align_left.png[] 
+image:align_right.png[]
+|These buttons shift the texture so that the Top/Bottom/Left/Right
 edge of the face are aligned with a texture boundary, but otherwise do not
 modify the scaling of the texture (unlike the *Fit* operation).
-|Flip Texture|Flips (mirrors) the texture along the horizontal or vertical axis.
+|
+image:flip_horiz.png[] image:flip_vert.png[]
+|Flips (mirrors) the texture along the horizontal or vertical axis.
 |Natural|This button resets the texture to a default alignment and scale, based
-the location and size of the face.
-|Texture Lock|If this is enabled, the alignment of the texture will be preserved
+the location and size of the face. The adjacent *Scale* spinbox allows you to control the
+default scale used for *Natural* fitting.
+|image:texture_lock.png[]
+|If this is enabled, the alignment of the texture will be preserved
 relative to the face if the brush or patch is moved in 3D space. If disabled,
 the texture itself will remain fixed in 3D space as the brush or patch moves,
 resulting in the alignment changing.