Revert "Merged with development"

This reverts commit 0d2023df94, reversing
changes made to bb11c5d5c4.
This commit is contained in:
SpoinkyNL committed 2016-04-25 18:03:05 +02:00
1 parent 1643efcc3f
commit 24b80fb79e
2 files changed
+7 -8

No files matched your search

+2 -3
View File
@@ -1,6 +1,5 @@
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;
@@ -80,8 +79,8 @@ namespace Artemis
private void CheckDuplicateInstances() private void CheckDuplicateInstances()
{ {
if (Process.GetProcesses().Count(p => p.ProcessName.Contains(Assembly.GetExecutingAssembly() var processes = Process.GetProcesses();
.FullName.Split(',')[0]) && !p.Modules[0].FileName.Contains("vshost")) < 2) if (processes.Count(p => p.ProcessName == "Artemis") < 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).",
+5 -5
View File
@@ -2,17 +2,17 @@
[ [
{ {
"Game":"RocketLeague", "Game":"RocketLeague",
"GameVersion":"1.16", "GameVersion":"1.15",
"GameAddresses":[ "GameAddresses":[
{ {
"Description":"Boost", "Description":"Boost",
"BasePointer":{ "BasePointer":{
"value":22411984 "value":22555396
}, },
"Offsets":[ "Offsets":[
1632, 180,
64, 260,
1636, 800,
1800, 1800,
540 540
] ]