Merge commit '5e82067dab34f381960c4ca18a334cfdfa154692'

configure.ac

@@ -125,7 +125,7 @@ if test "$wxWin" != 1; then
                 Please check that wx-config is in path, the directory
                 where wxWidgets libraries are installed (returned by
                 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-                equivalent variable and wxWidgets version is 2.3.4 or above.
+                equivalent variable and wxWidgets version is 3.0.0 or above.
         ])
 fi
 

include/imapresource.h

@@ -4,6 +4,8 @@
 #include "imodule.h"
 #include "imap.h"
 
+#include <sigc++/signal.h>
+
 namespace map 
 { 
 	class MapFormat; 
@@ -47,9 +49,19 @@ class IMapResourceManager :
 	 * Load the named map resource from VFS or from a physical path.
 	 */
 	virtual IMapResourcePtr loadFromPath(const std::string& path) = 0;
+
+	// Signal emitted when a MapExport is starting / is finished
+	typedef sigc::signal<void, const scene::IMapRootNodePtr&> ExportEvent;
+
+	// Event sent out right before a scene is sent to the exporter
+	virtual ExportEvent& signal_onResourceExporting() = 0;
+
+	// Event sent out right after a scene is sent to the exporter
+	virtual ExportEvent& signal_onResourceExported() = 0;
 };
 
-inline IMapResourceManager& GlobalMapResourceManager() {
+inline IMapResourceManager& GlobalMapResourceManager()
+{
 	// Cache the reference locally
 	static IMapResourceManager& _mapResourceManager(
 		*std::static_pointer_cast<IMapResourceManager>(

include/imodel.h

@@ -7,6 +7,8 @@
 #include "imodelsurface.h"
 #include <vector>
 
+#include "math/Vector3.h"
+
 /* Forward decls */
 class AABB;
 class ModelSkin;
@@ -110,6 +112,9 @@ class ModelNode
 	// Returns true if this model's scale has been modified
 	// and needs to be written to file
 	virtual bool hasModifiedScale() = 0;
+
+	// Returns the current scale of this model
+	virtual Vector3 getModelScale() = 0;
 };
 typedef std::shared_ptr<ModelNode> ModelNodePtr;
 

include/imodule.h

@@ -39,7 +39,7 @@ const char* const RKEY_PREFAB_PATH = "user/paths/prefabPath";
  * As long as no external module/plugin files are removed this number is safe to stay 
  * as it is. Keep this number compatible to std::size_t, i.e. unsigned.
  */
-#define MODULE_COMPATIBILITY_LEVEL 20180104
+#define MODULE_COMPATIBILITY_LEVEL 20200419
 
 // A function taking an error title and an error message string, invoked in debug builds
 // for things like ASSERT_MESSAGE and ERROR_MESSAGE

include/version.h

@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.8.0pre3"
+#define RADIANT_VERSION "2.8.1"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

install/games/darkmod.game

@@ -86,6 +86,7 @@
 				action="hide" />
 			<filterCriterion type="texture" match="textures/common/clip(_plusmovables)*$" action="hide" />
 			<filterCriterion type="texture" match="textures/common/moveableclipmodel" action="hide" />
+			<filterCriterion type="texture" match="textures/common/monster_player_clip_wood" action="hide" />
 		</filter>
 		<filter name="Trigger Textures">
 			<filterCriterion
@@ -218,6 +219,9 @@
 		<property match="s_omni" category="Sound" type="bool" />
 		<property match="s_volume" category="Sound" type="text" />
 		<property match="s_global" category="Sound" type="bool" />
+		<property match="_color_.+" category="Basic" type="colour" hidden="1" />
+		<property match="model_.+" category="Model" type="model" hidden="1" />
+		<property match="skin_.+" category="Model" type="skin" hidden="1" />
 	</entityInspector>
 
 	<!-- Game-specific values for light entities -->