1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00

Merged with development

This commit is contained in:
SpoinkyNL 2016-04-25 17:52:32 +02:00
commit 1643efcc3f
2 changed files with 97 additions and 96 deletions

View File

@ -1,5 +1,6 @@
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Forms; using System.Windows.Forms;
@ -79,8 +80,8 @@ namespace Artemis
private void CheckDuplicateInstances() private void CheckDuplicateInstances()
{ {
var processes = Process.GetProcesses(); if (Process.GetProcesses().Count(p => p.ProcessName.Contains(Assembly.GetExecutingAssembly()
if (processes.Count(p => p.ProcessName == "Artemis") < 2) .FullName.Split(',')[0]) && !p.Modules[0].FileName.Contains("vshost")) < 2)
return; return;
MessageBox.Show("An instance of Artemis is already running (check your system tray).", MessageBox.Show("An instance of Artemis is already running (check your system tray).",

View File

@ -2,17 +2,17 @@
[ [
{ {
"Game":"RocketLeague", "Game":"RocketLeague",
"GameVersion":"1.15", "GameVersion":"1.16",
"GameAddresses":[ "GameAddresses":[
{ {
"Description":"Boost", "Description":"Boost",
"BasePointer":{ "BasePointer":{
"value":22555396 "value":22411984
}, },
"Offsets":[ "Offsets":[
180, 1632,
260, 64,
800, 1636,
1800, 1800,
540 540
] ]