DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/SpoinkyNL/Artemis.git

Browse Source
This commit is contained in:
SpoinkyNL 2016-02-21 12:11:52 +01:00
commit b81120aa6a
7 changed files with 401 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

468
Artemis/Artemis/App.config
View File

@ -1,233 +1,237 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Artemis.Modules.Games.RocketLeague.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Modules.Games.RocketLeague.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.Offsets" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.Offsets" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Games.Witcher3.Witcher3" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Modules.Games.Witcher3.Witcher3" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Games.CounterStrike.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Modules.Games.CounterStrike.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.TypeWave" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.TypeWave" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.General" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.General" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<connectionStrings /> <connectionStrings />
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup> </startup>
<userSettings> <userSettings>
<Artemis.Modules.Games.RocketLeague.RocketLeague> <Artemis.Modules.Games.RocketLeague.RocketLeague>
<setting name="Enabled" serializeAs="String"> <setting name="Enabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="MainColor" serializeAs="String"> <setting name="MainColor" serializeAs="String">
<value>#FFFF5000</value> <value>#FFFF5000</value>
</setting> </setting>
<setting name="SecondaryColor" serializeAs="String"> <setting name="SecondaryColor" serializeAs="String">
<value>#FFFF0000</value> <value>#FFFF0000</value>
</setting> </setting>
</Artemis.Modules.Games.RocketLeague.RocketLeague> </Artemis.Modules.Games.RocketLeague.RocketLeague>
<Artemis.Settings.Offsets> <Artemis.Settings.Offsets>
<setting name="RocketLeague" serializeAs="String"> <setting name="RocketLeague" serializeAs="String">
<value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value> <value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value>
</setting> </setting>
<setting name="Witcher3" serializeAs="String"> <setting name="Witcher3" serializeAs="String">
<value>{"Game":"Witcher3","GameVersion":"1.11","GameAddresses":[{"Description":"Sign","BasePointer":{"value":42942304},"Offsets":[40,16,32,3008]}]}</value> <value>{"Game":"Witcher3","GameVersion":"1.11","GameAddresses":[{"Description":"Sign","BasePointer":{"value":42942304},"Offsets":[40,16,32,3008]}]}</value>
</setting> </setting>
</Artemis.Settings.Offsets> </Artemis.Settings.Offsets>
<Artemis.Modules.Games.Witcher3.Witcher3> <Artemis.Modules.Games.Witcher3.Witcher3>
<setting name="Enabled" serializeAs="String"> <setting name="Enabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
</Artemis.Modules.Games.Witcher3.Witcher3> </Artemis.Modules.Games.Witcher3.Witcher3>
<Artemis.Modules.Effects.AudioVisualizer.AudioVisualization> <Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
<setting name="Sensitivity" serializeAs="String"> <setting name="Sensitivity" serializeAs="String">
<value>4</value> <value>4</value>
</setting> </setting>
<setting name="Bars" serializeAs="String"> <setting name="Bars" serializeAs="String">
<value>21</value> <value>21</value>
</setting> </setting>
<setting name="FromBottom" serializeAs="String"> <setting name="FromBottom" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="FadeSpeed" serializeAs="String"> <setting name="FadeSpeed" serializeAs="String">
<value>3</value> <value>3</value>
</setting> </setting>
<setting name="TopColor" serializeAs="String"> <setting name="TopColor" serializeAs="String">
<value>#FFF90000</value> <value>#FFF90000</value>
</setting> </setting>
<setting name="MiddleColor" serializeAs="String"> <setting name="MiddleColor" serializeAs="String">
<value>#FFFF761E</value> <value>#FFFF761E</value>
</setting> </setting>
<setting name="BottomColor" serializeAs="String"> <setting name="BottomColor" serializeAs="String">
<value>#FF00DF00</value> <value>#FF00DF00</value>
</setting> </setting>
</Artemis.Modules.Effects.AudioVisualizer.AudioVisualization> </Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
<Artemis.Modules.Games.CounterStrike.CounterStrike> <Artemis.Modules.Games.CounterStrike.CounterStrike>
<setting name="GameDirectory" serializeAs="String"> <setting name="GameDirectory" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="AmmoEnabled" serializeAs="String"> <setting name="AmmoEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="AmmoMainColor" serializeAs="String"> <setting name="AmmoMainColor" serializeAs="String">
<value>#FFFF2900</value> <value>#FFFF2900</value>
</setting> </setting>
<setting name="AmmoSecondaryColor" serializeAs="String"> <setting name="AmmoSecondaryColor" serializeAs="String">
<value>#FF26F600</value> <value>#FF26F600</value>
</setting> </setting>
<setting name="TeamColorEnabled" serializeAs="String"> <setting name="TeamColorEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="FlashEnabled" serializeAs="String"> <setting name="FlashEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="SmokeEnabled" serializeAs="String"> <setting name="SmokeEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="LowHpEnabled" serializeAs="String"> <setting name="LowHpEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="Enabled" serializeAs="String"> <setting name="Enabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
</Artemis.Modules.Games.CounterStrike.CounterStrike> </Artemis.Modules.Games.CounterStrike.CounterStrike>
<Artemis.Settings.CounterStrike> <Artemis.Settings.CounterStrike>
<setting name="GameDirectory" serializeAs="String"> <setting name="GameDirectory" serializeAs="String">
<value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value> <value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value>
</setting> </setting>
<setting name="AmmoEnabled" serializeAs="String"> <setting name="AmmoEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="AmmoMainColor" serializeAs="String"> <setting name="AmmoMainColor" serializeAs="String">
<value>#FFFF2900</value> <value>#FFFF2900</value>
</setting> </setting>
<setting name="AmmoSecondaryColor" serializeAs="String"> <setting name="AmmoSecondaryColor" serializeAs="String">
<value>#FF26F600</value> <value>#FF26F600</value>
</setting> </setting>
<setting name="TeamColorEnabled" serializeAs="String"> <setting name="TeamColorEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="FlashEnabled" serializeAs="String"> <setting name="FlashEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="SmokeEnabled" serializeAs="String"> <setting name="SmokeEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="LowHpEnabled" serializeAs="String"> <setting name="LowHpEnabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
</Artemis.Settings.CounterStrike> </Artemis.Settings.CounterStrike>
<Artemis.Settings.VolumeDisplay> <Artemis.Settings.VolumeDisplay>
<setting name="MainColor" serializeAs="String"> <setting name="MainColor" serializeAs="String">
<value>#FFFF2900</value> <value>#FFFF2900</value>
</setting> </setting>
<setting name="SecondaryColor" serializeAs="String"> <setting name="SecondaryColor" serializeAs="String">
<value>#FF26F600</value> <value>#FF26F600</value>
</setting> </setting>
<setting name="Enabled" serializeAs="String"> <setting name="Enabled" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
</Artemis.Settings.VolumeDisplay> </Artemis.Settings.VolumeDisplay>
<Artemis.Settings.AudioVisualization> <Artemis.Settings.AudioVisualization>
<setting name="Sensitivity" serializeAs="String"> <setting name="Sensitivity" serializeAs="String">
<value>4</value> <value>4</value>
</setting> </setting>
<setting name="Bars" serializeAs="String"> <setting name="Bars" serializeAs="String">
<value>21</value> <value>21</value>
</setting> </setting>
<setting name="Spread" serializeAs="String"> <setting name="Spread" serializeAs="String">
<value>1</value> <value>1</value>
</setting> </setting>
<setting name="FadeSpeed" serializeAs="String"> <setting name="FadeSpeed" serializeAs="String">
<value>3</value> <value>3</value>
</setting> </setting>
<setting name="MainColor" serializeAs="String"> <setting name="MainColor" serializeAs="String">
<value>#FF0000FF</value> <value>#FF0000FF</value>
</setting> </setting>
<setting name="SecondaryColor" serializeAs="String"> <setting name="SecondaryColor" serializeAs="String">
<value>#FF1E90FF</value> <value>#FF1E90FF</value>
</setting> </setting>
</Artemis.Settings.AudioVisualization> </Artemis.Settings.AudioVisualization>
<Artemis.Settings.RocketLeague> <Artemis.Settings.RocketLeague>
<setting name="Enabled" serializeAs="String"> <setting name="Enabled" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
<setting name="MainColor" serializeAs="String"> <setting name="MainColor" serializeAs="String">
<value>#FFFF5000</value> <value>#FFFF5000</value>
</setting> </setting>
<setting name="SecondaryColor" serializeAs="String"> <setting name="SecondaryColor" serializeAs="String">
<value>#FFFF0000</value> <value>#FFFF0000</value>
</setting> </setting>
</Artemis.Settings.RocketLeague> </Artemis.Settings.RocketLeague>
<Artemis.Properties.Settings> <Artemis.Properties.Settings>
<setting name="LastEffect" serializeAs="String"> <setting name="LastEffect" serializeAs="String">
<value>TypeWave</value> <value>TypeWave</value>
</setting> </setting>
</Artemis.Properties.Settings> </Artemis.Properties.Settings>
<Artemis.Settings.TypeWave> <Artemis.Settings.TypeWave>
<setting name="IsRandomColors" serializeAs="String"> <setting name="IsRandomColors" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="WaveColor" serializeAs="String"> <setting name="WaveColor" serializeAs="String">
<value>#FFFF0000</value> <value>#FFFF0000</value>
</setting> </setting>
<setting name="IsShiftColors" serializeAs="String"> <setting name="IsShiftColors" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="ShiftColorSpeed" serializeAs="String"> <setting name="ShiftColorSpeed" serializeAs="String">
<value>20</value> <value>20</value>
</setting> </setting>
<setting name="TimeToLive" serializeAs="String"> <setting name="TimeToLive" serializeAs="String">
<value>500</value> <value>500</value>
</setting> </setting>
<setting name="SpreadSpeed" serializeAs="String"> <setting name="SpreadSpeed" serializeAs="String">
<value>4</value> <value>4</value>
</setting> </setting>
</Artemis.Settings.TypeWave> </Artemis.Settings.TypeWave>
<Artemis.Settings.General> <Artemis.Settings.General>
<setting name="LastEffect" serializeAs="String"> <setting name="LastEffect" serializeAs="String">
<value>TypeWave</value> <value>TypeWave</value>
</setting> </setting>
<setting name="LastKeyboard" serializeAs="String"> <setting name="LastKeyboard" serializeAs="String">
<value>Corsair Gaming K95 RGB</value> <value>Corsair Gaming K95 RGB</value>
</setting> </setting>
<setting name="EnablePointersUpdate" serializeAs="String"> <setting name="EnablePointersUpdate" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="GamestatePort" serializeAs="String"> <setting name="GamestatePort" serializeAs="String">
<value>51364</value> <value>51364</value>
</setting> </setting>
<setting name="Autorun" serializeAs="String"> <setting name="Autorun" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
</Artemis.Settings.General> </Artemis.Settings.General>
</userSettings> </userSettings>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" /> <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" /> <bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" /> <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Caliburn.Micro.Platform" publicKeyToken="8e5891231f2ed21f" culture="neutral" /> <assemblyIdentity name="Caliburn.Micro.Platform" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> <dependentAssembly>
</runtime> <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration> </configuration>

29
Artemis/Artemis/Artemis.csproj
View File

@ -115,28 +115,28 @@
<Prefer32Bit>true</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath> <HintPath>..\packages\Autofac.4.0.0-rc1-177\lib\net45\Autofac.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Caliburn.Micro, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.Core.2.0.2\lib\net45\Caliburn.Micro.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.Core.2.0.2\lib\net45\Caliburn.Micro.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Caliburn.Micro.Autofac, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro.Autofac, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.AutofacBootstrap.2.0.8\lib\net40\Caliburn.Micro.Autofac.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.AutofacBootstrap.2.0.9-beta\lib\net40\Caliburn.Micro.Autofac.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Caliburn.Micro.Platform, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro.Platform, Version=2.0.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Corale.Colore, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Corale.Colore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Colore.3.0.2\lib\net35\Corale.Colore.dll</HintPath> <HintPath>..\packages\Colore.4.0.0\lib\net35\Corale.Colore.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CUE.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="CUE.NET, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CUE.NET.1.0.0\lib\net45\CUE.NET.dll</HintPath> <HintPath>..\packages\CUE.NET.1.0.2\lib\net45\CUE.NET.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
@ -151,8 +151,8 @@
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.2.4.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.3.0.37, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA037\lib\net45\MahApps.Metro.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -172,10 +172,7 @@
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@ -529,12 +526,12 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets')" /> <Import Project="..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>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}.</ErrorText> <ErrorText>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}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets'))" /> <Error Condition="!Exists('..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

180
Artemis/Artemis/KeyboardProviders/Corsair/K70.cs
View File

@ -1,88 +1,94 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Artemis.Utilities; using Artemis.Utilities;
using CUE.NET; using CUE.NET;
using CUE.NET.Devices.Generic.Enums; using CUE.NET.Devices.Generic.Enums;
using CUE.NET.Devices.Keyboard; using CUE.NET.Devices.Keyboard;
using CUE.NET.Exceptions; using CUE.NET.Exceptions;
namespace Artemis.KeyboardProviders.Corsair namespace Artemis.KeyboardProviders.Corsair
{ {
internal class K70 : KeyboardProvider internal class K70 : KeyboardProvider
{ {
private CorsairKeyboard _keyboard; private CorsairKeyboard _keyboard;
public K70() public K70()
{ {
Name = "Corsair Gaming K70 RGB"; Name = "Corsair Gaming K70 RGB";
} }
public override bool CanEnable() public override bool CanEnable()
{ {
try try
{ {
CueSDK.Initialize(); CueSDK.Initialize();
} }
catch (CUEException e) catch (CUEException e)
{ {
if (e.Error == CorsairError.ServerNotFound) if (e.Error == CorsairError.ServerNotFound)
return false; return false;
throw; throw;
} }
catch (WrapperException)
return true; {
CueSDK.Reinitialize();
} return true;
}
/// <summary>
/// Enables the SDK and sets updatemode to manual as well as the color of the background to black. return true;
/// </summary>
public override void Enable() }
{
try /// <summary>
{ /// Enables the SDK and sets updatemode to manual as well as the color of the background to black.
CueSDK.Initialize(); /// </summary>
} public override void Enable()
catch (WrapperException) {
{ try
/*CUE is already initialized*/ {
} CueSDK.Initialize();
_keyboard = CueSDK.KeyboardSDK; }
Height = (int)_keyboard.KeyboardRectangle.Height; catch (WrapperException)
Width = (int)_keyboard.KeyboardRectangle.Width; {
/*CUE is already initialized*/
// _keyboard.UpdateMode = UpdateMode.Manual; }
_keyboard.Update(true); _keyboard = CueSDK.KeyboardSDK;
} Height = 7; //(int) _keyboard.KeyboardRectangle.Height;
Width = 21; //(int) _keyboard.KeyboardRectangle.Width;
public override void Disable()
{ // _keyboard.UpdateMode = UpdateMode.Manual;
} _keyboard.Update(true);
}
/// <summary>
/// Properly resizes any size bitmap to the keyboard by creating a rectangle whose size is dependent on the bitmap public override void Disable()
/// size. {
/// Does not reset the color each time. Uncomment line 48 for collor reset. CueSDK.Reinitialize();
/// </summary> }
/// <param name="bitmap//"></param>
public override void DrawBitmap(Bitmap bitmap) /// <summary>
{ /// Properly resizes any size bitmap to the keyboard by creating a rectangle whose size is dependent on the bitmap
using ( /// size.
var resized = ImageUtilities.ResizeImage(bitmap, /// Does not reset the color each time. Uncomment line 48 for collor reset.
(int)_keyboard.KeyboardRectangle.Width, /// </summary>
(int)_keyboard.KeyboardRectangle.Height) /// <param name="bitmap"></param>
) public override void DrawBitmap(Bitmap bitmap)
{ {
foreach (var item in _keyboard.Keys) using (
{ var resized = ImageUtilities.ResizeImage(bitmap,
var ledColor = resized.GetPixel((int)item.KeyRectangle.X, (int)item.KeyRectangle.Y); (int)_keyboard.KeyboardRectangle.Width,
if (ledColor == Color.FromArgb(0, 0, 0, 0)) (int)_keyboard.KeyboardRectangle.Height)
ledColor = Color.Black; )
item.Led.Color = ledColor; {
} foreach (var item in _keyboard.Keys)
} {
_keyboard.Update(true); var ledColor = resized.GetPixel((int)item.KeyRectangle.X, (int)item.KeyRectangle.Y);
} if (ledColor == Color.FromArgb(0, 0, 0, 0))
} ledColor = Color.Black;
item.Led.Color = ledColor;
}
}
_keyboard.Update(true);
}
}
} }

10
Artemis/Artemis/KeyboardProviders/Corsair/K95.cs
View File

@ -30,6 +30,11 @@ namespace Artemis.KeyboardProviders.Corsair
return false; return false;
throw; throw;
} }
catch (WrapperException)
{
CueSDK.Reinitialize();
return true;
}
return true; return true;
@ -49,8 +54,8 @@ namespace Artemis.KeyboardProviders.Corsair
/*CUE is already initialized*/ /*CUE is already initialized*/
} }
_keyboard = CueSDK.KeyboardSDK; _keyboard = CueSDK.KeyboardSDK;
Height = (int) _keyboard.KeyboardRectangle.Height; Height = 7; //(int) _keyboard.KeyboardRectangle.Height;
Width = (int) _keyboard.KeyboardRectangle.Width; Width = 24; //(int) _keyboard.KeyboardRectangle.Width;
// _keyboard.UpdateMode = UpdateMode.Manual; // _keyboard.UpdateMode = UpdateMode.Manual;
_keyboard.Update(true); _keyboard.Update(true);
@ -58,6 +63,7 @@ namespace Artemis.KeyboardProviders.Corsair
public override void Disable() public override void Disable()
{ {
CueSDK.Reinitialize();
} }
/// <summary> /// <summary>

18
Artemis/Artemis/Models/MainModel.cs
View File

@ -115,11 +115,23 @@ namespace Artemis.Models
// Disable everything if there's no active keyboard found // Disable everything if there's no active keyboard found
if (!keyboardProvider.CanEnable()) if (!keyboardProvider.CanEnable())
{ {
string message;
if (keyboardProvider.Name.ToLower().Contains("Corsair"))
{
message = "Couldn't connect to the " + keyboardProvider.Name + ".\n " +
"Please check your cables and/or drivers (could be outdated) and that Corsair Utility Engine is running.\n\n " +
"If needed, you can select a different keyboard in Artemis under settings.";
}
else
{
message = "Couldn't connect to the " + keyboardProvider.Name + ".\n " +
"Please check your cables and/or drivers (could be outdated).\n\n " +
"If needed, you can select a different keyboard in Artemis under settings.";
}
ActiveKeyboard = null; ActiveKeyboard = null;
MessageBox.Show( MessageBox.Show(
"Couldn't connect to the " + keyboardProvider.Name + ".\n " + message,
"Please check your cables and/or drivers (could be outdated).\n\n " +
"If needed, you can select a different keyboard in Artemis under settings",
"Artemis (╯°□°）╯︵ ┻━┻", "Artemis (╯°□°）╯︵ ┻━┻",
MessageBoxButtons.OK, MessageBoxButtons.OK,
MessageBoxIcon.Warning); MessageBoxIcon.Warning);

34
Artemis/Artemis/packages.config
View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Autofac" version="3.5.2" targetFramework="net452" /> <package id="Autofac" version="4.0.0-rc1-177" targetFramework="net452" />
<package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" /> <package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" />
<package id="Caliburn.Micro.AutofacBootstrap" version="2.0.8" targetFramework="net452" /> <package id="Caliburn.Micro.AutofacBootstrap" version="2.0.9-beta" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net452" /> <package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net452" />
<package id="Colore" version="3.0.2" targetFramework="net452" /> <package id="Colore" version="4.0.0" targetFramework="net452" />
<package id="CUE.NET" version="1.0.0" targetFramework="net452" /> <package id="CUE.NET" version="1.0.2" targetFramework="net452" />
<package id="Extended.Wpf.Toolkit" version="2.6" targetFramework="net452" /> <package id="Extended.Wpf.Toolkit" version="2.6" targetFramework="net452" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net452" /> <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net452" />
<package id="log4net" version="2.0.5" targetFramework="net452" /> <package id="log4net" version="2.0.5" targetFramework="net452" />
<package id="MahApps.Metro" version="1.2.4.0" targetFramework="net452" /> <package id="MahApps.Metro" version="1.3.0-ALPHA037" targetFramework="net452" />
<package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net452" /> <package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net452" />
<package id="MouseKeyHook" version="5.4.0" targetFramework="net452" /> <package id="MouseKeyHook" version="5.4.0" targetFramework="net452" />
<package id="NAudio" version="1.7.3" targetFramework="net452" /> <package id="NAudio" version="1.7.3" targetFramework="net452" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" /> <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
<package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" /> <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
</packages> </packages>

41
pointers.json
View File

@ -1,25 +1,22 @@
// Pointers used to auto-update // Pointers used to auto-update
[ [
{ {
"Game": "Witcher3", "Game":"RocketLeague",
"GameVersion": "1.11", "GameVersion":"1.12",
"GameAddresses": [ "GameAddresses":[
{ {
"Description": "Sign", "Description":"Boost",
"BasePointer": { "value": 42942304 }, "BasePointer":{
"Offsets": [ 40, 16, 32, 3008 ] "value":22551284
} },
] "Offsets":[
}, 180,
{ 260,
"Game": "RocketLeague", 800,
"GameVersion": "1.10", 1800,
"GameAddresses": [ 540
{ ]
"Description": "Boost", }
"BasePointer": { "value": 21998084 }, ]
"Offsets": [ 88, 1452, 1780, 540 ] }
}
]
}
] ]