Merge remote-tracking branch 'refs/remotes/origin/4.17-update'

HydraPlugin.uplugin

@@ -2,12 +2,13 @@
   "FileVersion" : 3,
 	"FriendlyName" : "Razer Hydra Plugin",
 	"Version" : 1,
-	"VersionName" : "0.9.6",
+	"VersionName" : "1.0.0",
 	"CreatedBy" : "Getnamo",
 	"CreatedByURL" : "http://getnamo.com",
 	"DocsURL" : "https://github.com/getnamo/hydra-ue4",
 	"Description" : "Unofficial plugin for the Razer Hydra Motion Controller",
-	"Category" : "Input Devices",
+  "Category": "Input Devices",
+  "EnabledByDefault": true,
   "Modules" :
 	[
     {

Source/HydraPlugin/Private/FHydraPlugin.cpp

@@ -8,12 +8,39 @@
 #include "HydraControllerComponent.h"
 #include "HydraUtility.h"
 
+#include "PreWindowsApi.h"
+#include "AllowWindowsPlatformTypes.h"
+#include "AllowWindowsPlatformAtomics.h"
+
+#pragma warning(push)
+#pragma warning(disable: 4191)
+#pragma warning(disable: 4996)
+
+#ifndef DeleteFile
+#define DeleteFile DeleteFileW
+#endif
+#ifndef MoveFile
+#define MoveFile MoveFileW
+#endif
+
+#ifndef LoadString
+#define LoadString LoadStringW
+#endif
+
+#ifndef GetMessage
+#define GetMessage GetMessageW
+#endif
+
 #include <iostream>
 #include <stdexcept>
 #include <vector>
 #include <sixense.h>
 #include <windows.h>
 
+#include "HideWindowsPlatformAtomics.h"
+#include "HideWindowsPlatformTypes.h"
+#include "PostWindowsApi.h"
+
 #define LOCTEXT_NAMESPACE "HydraPlugin"
 #define HYDRA_HISTORY_MAX 3				//frame history for data, shrunken to minimum 3 frame history for acceleration
 DEFINE_LOG_CATEGORY_STATIC(HydraPluginLog, Log, All);
@@ -219,6 +246,11 @@ class FHydraController : public IInputDevice, public IMotionController
 
 	TArray<FHydraKeyMap> LeftKeyMap;
 	TArray<FHydraKeyMap> RightKeyMap;
+
+	virtual FName IMotionController::GetMotionControllerDeviceTypeName(void) const override
+	{
+		return TEXT("Razer Hydra");
+	}
 
 	void AddInputMappingKeys()
 	{