Merge branch 'dev' into master

antonpup · May 26, 2020 · 39942fa · 39942fa
2 parents e96548b + 3e3db4c
commit 39942fa
Show file tree

Hide file tree

Showing 558 changed files with 23,976 additions and 10,238 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -48,7 +48,8 @@
         "code",
         "question",
         "doc",
-        "maintenance"
+        "maintenance",
+        "review"
       ]
     },
     {
@@ -59,7 +60,10 @@
       "contributions": [
         "code",
         "question",
-        "maintenance"
+        "maintenance",
+        "projectManagement",
+        "review",
+        "doc"
       ]
     },
     {
@@ -185,6 +189,51 @@
       "contributions": [
         "question"
       ]
+    },
+    {
+      "login": "Fluto",
+      "name": "Fluto",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/7686594?v=4",
+      "profile": "https://github.com/Fluto",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "stuntguy3000",
+      "name": "Luke Anderson",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1522389?v=4",
+      "profile": "http://stuntguy3000.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thingamajig0",
+      "name": "thingamajig0",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/31176843?v=4",
+      "profile": "https://github.com/thingamajig0",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rushdie99",
+      "name": "polinyeh",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/9208301?v=4",
+      "profile": "https://github.com/rushdie99",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "xQwexx",
+      "name": "Qwex",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/17799600?v=4",
+      "profile": "https://github.com/xQwexx",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ local.properties
 *.suo
 *.user
 *.sln.docstates
+/.vs
 
 # Build results
 

diff --git a/Installer/installer.iss b/Installer/installer.iss
@@ -1,4 +1,4 @@
-#define public Version "0.6.1"
+#define public Version "0.8.0"
 
 #ifdef EXTERNAL_VERSION
  #if len(EXTERNAL_VERSION)>0

diff --git a/Project-Aurora/Aurora-LeagueLogiLEDWrapper/Aurora-LeagueLogiLEDWrapper.vcxproj b/Project-Aurora/Aurora-LeagueLogiLEDWrapper/Aurora-LeagueLogiLEDWrapper.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{7A7C78E5-0307-4139-9625-401A5A56C51F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>AuroraLeagueLogiLEDWrapper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj b/Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{A759300D-9550-47BA-8616-C24B6BC05A02}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>AuroraLightFXWrapper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj b/Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{20259BE1-55C9-4EFB-9D30-C933F621B9D4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>AuroraLogiLEDWrapper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj b/Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>AuroraRazerLEDWrapper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/Project-Aurora/Aurora-SkypeIntegration/App.config b/Project-Aurora/Aurora-SkypeIntegration/App.config
diff --git a/Project-Aurora/Aurora-SkypeIntegration/Aurora-SkypeIntegration.csproj b/Project-Aurora/Aurora-SkypeIntegration/Aurora-SkypeIntegration.csproj
diff --git a/Project-Aurora/Aurora-SkypeIntegration/Integration/SkypeIntegration.cs b/Project-Aurora/Aurora-SkypeIntegration/Integration/SkypeIntegration.cs