From 87a30b8936053ca495c5468d432326c532b18546 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Sat, 18 Mar 2017 17:23:51 +0100 Subject: [PATCH] Added K95 Platinum support Added default profiles for Assetto Corsa resolving #131 Fixed default profiles for the CM Pro S resolving #316 Fixed keybinds on folders #276 Fixed window scaling with many layers #276 --- Artemis/Artemis/Artemis.csproj | 17 +- .../Corsair/CorsairKeyboard.cs | 21 ++- .../Artemis/Modules/Abstract/ModuleModel.cs | 7 +- .../Games/AssettoCorsa/AssettoCorsaView.xaml | 72 +++++---- .../Games/CounterStrike/CounterStrikeModel.cs | 13 +- .../CounterStrike/CounterStrikeView.xaml | 82 +++++----- .../Modules/Games/Dota2/Dota2View.xaml | 98 ++++++------ .../EurotruckSimulator2View.xaml | 146 +++++++++--------- .../Artemis/Modules/Games/GtaV/GtaVView.xaml | 64 ++++---- .../Modules/Games/LightFx/LightFxView.xaml | 80 +++++----- .../Games/Overwatch/OverwatchView.xaml | 106 +++++++------ .../Games/ProjectCars/ProjectCarsView.xaml | 88 ++++++----- .../Games/RocketLeague/RocketLeagueView.xaml | 94 ++++++----- .../Games/TheDivision/TheDivisionView.xaml | 72 +++++---- .../UnrealTournamentView.xaml | 100 ++++++------ .../Modules/Games/Witcher3/Witcher3View.xaml | 94 ++++++----- .../Artemis/Modules/Games/WoW/WoWView.xaml | 90 ++++++----- .../GeneralProfile/GeneralProfileView.xaml | 80 +++++----- .../OverlayProfile/OverlayProfileView.xaml | 64 ++++---- Artemis/Artemis/NLog.xsd | 33 +++- .../Profiles/Layers/Models/LayerModel.cs | 39 +++-- Artemis/Artemis/Profiles/ProfileModel.cs | 19 ++- .../Artemis/Properties/Resources.Designer.cs | 12 +- Artemis/Artemis/Properties/Resources.resx | 3 + .../csgoGamestateConfiguration.txt | 1 + .../Resources/Keyboards/default-profiles.zip | Bin 401430 -> 463942 bytes .../Resources/Keyboards/k95-platinum.png | Bin 0 -> 307003 bytes .../Utilities/DataReaders/DllManager.cs | 49 +++--- .../Utilities/Keyboard/KeyboardHook.cs | 13 +- .../ViewModels/ProfileEditorViewModel.cs | 14 +- .../Profiles/LayerConditionViewModel.cs | 54 ++----- Artemis/Artemis/Views/ProfileEditorView.xaml | 2 +- .../Views/Profiles/LayerKeybindView.xaml | 6 +- Artemis/Artemis/packages.config | 10 +- 34 files changed, 844 insertions(+), 799 deletions(-) create mode 100644 Artemis/Artemis/Resources/Keyboards/k95-platinum.png diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index 2181a19b4..d7ddc8851 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -163,8 +163,8 @@ ..\packages\CSCore.1.2.0\lib\net35-client\CSCore.dll True - - ..\packages\CUE.NET.1.1.2.1\lib\net45\CUE.NET.dll + + ..\packages\CUE.NET.1.1.3.0\lib\net45\CUE.NET.dll True @@ -199,8 +199,8 @@ ..\packages\squirrel.windows.1.4.4\lib\Net45\ICSharpCode.SharpZipLib.dll True - - ..\packages\log4net.2.0.7\lib\net45-full\log4net.dll + + ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll True @@ -248,7 +248,7 @@ True - ..\packages\NLog.4.4.3\lib\net45\NLog.dll + ..\packages\NLog.4.4.4\lib\net45\NLog.dll True @@ -272,7 +272,7 @@ True - ..\packages\SpotifyAPI-NET.2.12.0\lib\SpotifyAPI.dll + ..\packages\SpotifyAPI-NET.2.13.1\lib\SpotifyAPI.dll True @@ -778,6 +778,7 @@ Designer + @@ -1064,12 +1065,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + + - - - The Assetto Corsa module uses the Assetto Corsa Shared Memory Library project by mdjarv. - + + + The Assetto Corsa module uses the Assetto Corsa Shared Memory Library project by mdjarv. + - - - + + + - - + + - - - -