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

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 
 # Project name and version
-project(darkradiant VERSION 3.9.1)
+project(darkradiant VERSION 3.9.2)
 
 # C++ standard
 set(CMAKE_CXX_STANDARD 17)

debian/changelog

@@ -1,3 +1,18 @@
+darkradiant (3.9.2~jammy1) jammy; urgency=medium
+
+  * Fix incorrect preview rendering of vertex blends between pairs of diffuse
+    and bump maps.
+  * Fix inability to choose source and replacement materials using the Skin
+    Editor GUI.
+  * Several additional layout and usability improvements to Skin Editor.
+  * Improvements to layout and organisation of Preferences dialog; consolidate a
+    few pages and remove obsolete items.
+  * Add a new preference to control the font size of text in the various source
+    code editors.
+  * Fix wxGTK assertion failure on opening Stim/Response editor.
+
+ -- Matthew Mott <[email protected]>  Mon, 19 Aug 2024 19:24:12 +0100
+
 darkradiant (3.9.1~jammy1) jammy; urgency=medium
 
   * Textures with RGTC normal maps no longer show as black in lighting preview
@@ -315,4 +330,3 @@ darkradiant (1.7.0~raring1) raring; urgency=low
   * 1.7.0 release.
 
  -- Matthew Mott <[email protected]>  Mon, 14 Nov 2011 11:13:41 +0000
-

debian/control

@@ -2,7 +2,7 @@ Source: darkradiant
 Section: editors
 Priority: optional
 Maintainer: Matthew Mott <[email protected]>
-Build-Depends: debhelper (>= 10), cmake (>= 3.12), pkg-config, asciidoctor, libxml2-dev, libglew-dev, python3-dev, libvorbis-dev, libopenal-dev, libalut-dev, libjpeg-dev, libftgl-dev, libwxbase3.0-dev, libwxgtk3.0-gtk3-dev, libsigc++-2.0-dev, libglib2.0-dev, libeigen3-dev, libgit2-dev
+Build-Depends: debhelper (>= 10), cmake (>= 3.12), pkg-config, asciidoctor, libxml2-dev, libglew-dev, python3-dev, libvorbis-dev, libopenal-dev, libalut-dev, libjpeg-dev, libftgl-dev, libwxgtk3.2-dev, libsigc++-2.0-dev, libglib2.0-dev, libeigen3-dev, libgit2-dev
 Homepage: https://www.darkradiant.net/
 Vcs-Git: https://gitlab.com/orbweaver/DarkRadiant.git
 Standards-Version: 4.5.1

doc/manual.adoc

@@ -1965,7 +1965,7 @@ primitive. See <<ReparentingPrimitives,reparenting primitives>>.
 second selected entity.
 
 *Bind selected entities*:: Set a `bind` spawnarg on the first selected entity pointing to the
-*second selected entity.
+second selected entity.
 
 *Entity class tree...*:: Show a tree of all available entity types in the current game, along with
 all of their properties. Unlike the tree shown in the *Create Entity* dialog, this entity class
@@ -2083,43 +2083,13 @@ the 2D views.
 *Show grid*:: Control the visibility of grid lines in the 2D views. This does
  not affect the snapping behaviour, just the visual rendering of the grid.
 
-*Show size info*:: Control the visibility of the text overlays which show the
- dimensions of a selected object on the X, Y or Z axes. This option is also
- available in the `View -> Show` menu.
-
-*Show entity angle arrow*:: Hide or show the small arrow which indicates the
- direction of an entity with an `angle` spawnarg, such as `info_player_start`.
- This affects both the 2D and 3D views.
-
-*Show entity names*:: Enable this to show permanently-visible text names next to
- each entity in the map. This option is also available as `View -> Show -> Show
- names`.
-
 *Show blocks*:: If enabled, the world space is divided into a horizontal grid of
  1024x1024 unit blocks (of infinite height) which are outlined in blue in the 2D
  views. Each block is assigned a pair of numbers representing its position from
  the centermost block, which is assigned `(0, 0)`. This might help with
  "blocking out" a map at the beginning of the design phase. This option is also
  available in the `View -> Show` menu.
 
-*Show coordinates*:: Toggle the visibility of the coordinate rulers along the
- edges of the 2D window. Also available in the `View -> Show` menu.
-
-*Show axes*:: Control the visibility of the axis widget displayed at the
- top-left of each 2D window and at the world origin. Also available in the `View
- -> Show` menu.
-
-*Show window outline*:: Enable this to draw a rectangular outline around the
- edge of the 2D window. Depending on the platform and GUI theme this may be
- almost invisible, but might be useful to improve visibility in certain
- environments.
-
-*Show workzone*:: The 'workzone' is an imaginary axis-aligned cuboid which
- encloses the set of currently-selected items (this is what defines the volume
- of a new light, when a <<CreatingLights,light is created>> from one or more
- existing brushes). Enabling this option causes the workzone to be outlined in
- red in the 2D views. Also available in the `View -> Show` menu.
-
 *Translate manipulator always constrained to axis*:: This option affects the
  behaviour of the <<ManipulatorModes,translate manipulator>>. When the option is
  disabled, dragging a selected object in translation mode will behave as if the
@@ -2135,11 +2105,17 @@ the 2D views.
  controls whether DarkRadiant will prefer to select the entity (enabled) or the
  brush (disabled).
 
-==== Multi Monitor settings
+==== User Interface settings
+
+*Start on Monitor*:: If you have more than one monitor, you can choose which
+monitor DarkRadiant will start on using this combo box.
+
+*Source view font size*:: This controls the point size of the monospace font
+used in source code view widgets, such as those which show material or skin
+source declarations.
 
-The Multi Monitor page contains a single setting, *Start DarkRadiant on
-monitor*, which allows you to choose which monitor DarkRadiant will start on if
-you have several available.
+*Language*:: This combo box lists all of the installed language packs, allowing
+you to choose which language is used for the DarkRadiant interface.
 
 ==== Autosave settings
 

include/ishaderlayer.h

@@ -482,6 +482,7 @@ inline std::ostream& operator<< (std::ostream& os, IShaderLayer::VertexColourMod
     default:
         return os;
     }
+    return os;
 }
 
 inline std::ostream& operator<< (std::ostream& os, IShaderLayer::Type type)
@@ -498,6 +499,7 @@ inline std::ostream& operator<< (std::ostream& os, IShaderLayer::Type type)
     default:
         return os;
     }
+    return os;
 }
 
 inline std::ostream& operator<< (std::ostream& os, IShaderLayer& layer)

install/scripts/commands/ase_export.py

@@ -272,7 +272,7 @@ def visit(self, scenenode):
 \t\t\t*MAP_CLASS "Bitmap"
 \t\t\t*MAP_SUBNO 1
 \t\t\t*MAP_AMOUNT 1.0000
-\t\t\t*BITMAP "\\\\purgatory\\purgatory\\doom\\base\{2}"
+\t\t\t*BITMAP "//base/{2}"
 \t\t\t*MAP_TYPE Screen
 \t\t\t*UVW_U_OFFSET 0.0000
 \t\t\t*UVW_V_OFFSET 0.0000
@@ -288,7 +288,7 @@ def visit(self, scenenode):
 \t\t\t*BITMAP_FILTER Pyramidal
 \t\t}}
 \t}}
-'''.format(shaderlist.index(x), x, x.replace('/','\\'))
+'''.format(shaderlist.index(x), x, x)
 
             geomobjects = str()
 

install/scripts/commands/ase_export_blend.py

@@ -350,7 +350,7 @@ def visit(self, scenenode):
 \t\t\t*MAP_CLASS "Bitmap"
 \t\t\t*MAP_SUBNO 1
 \t\t\t*MAP_AMOUNT 1.0000
-\t\t\t*BITMAP "\\\\purgatory\\purgatory\\doom\\base\{2}"
+\t\t\t*BITMAP "//base/{2}"
 \t\t\t*MAP_TYPE Screen
 \t\t\t*UVW_U_OFFSET 0.0000
 \t\t\t*UVW_V_OFFSET 0.0000