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

Pushed development on top of master to get rid of annoying Git issues. This'll give us a fresh start

This commit is contained in:
SpoinkyNL 2016-04-27 20:38:35 +02:00
commit c52be47e9f
3 changed files with 139 additions and 137 deletions

View File

@ -75,6 +75,8 @@ namespace Artemis.Managers
if (!keyboardProvider.CanEnable()) if (!keyboardProvider.CanEnable())
{ {
_mainManager.DialogService.ShowErrorMessageBox(keyboardProvider.CantEnableText); _mainManager.DialogService.ShowErrorMessageBox(keyboardProvider.CantEnableText);
General.Default.LastKeyboard = null;
General.Default.Save();
return; return;
} }

View File

@ -125,9 +125,9 @@ namespace Artemis.ViewModels.Flyouts
protected override void HandleOpen() protected override void HandleOpen()
{ {
SelectedKeyboardProvider = General.Default.LastKeyboard.Length > 0 SelectedKeyboardProvider = string.IsNullOrEmpty(General.Default.LastKeyboard)
? General.Default.LastKeyboard ? "None"
: "None"; : General.Default.LastKeyboard;
} }
} }
} }

View File

@ -2,18 +2,18 @@
[ [
{ {
"Game":"RocketLeague", "Game":"RocketLeague",
"GameVersion":"1.16", "GameVersion":"1.17",
"GameAddresses":[ "GameAddresses":[
{ {
"Description":"Boost", "Description":"Boost",
"BasePointer":{ "BasePointer":{
"value":22411984 "value":22531104
}, },
"Offsets":[ "Offsets":[
1632, 1648,
64, 64,
1636, 484,
1800, 1828,
540 540
] ]
} }