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

Did a total of nothing, made a design choice

Browse Source
This commit is contained in:
Logan Saso 2016-03-26 12:55:15 -07:00
parent ae833786b3
commit 6ba2417969
3 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs
View File

@ -34,13 +34,13 @@ namespace Artemis.Modules.Effects.Debug
KeyboardRectangle = new KeyboardRectangle(MainManager.KeyboardManager.ActiveKeyboard, 0, 0, new List<Color> KeyboardRectangle = new KeyboardRectangle(MainManager.KeyboardManager.ActiveKeyboard, 0, 0, new List<Color>
{ {
//Color.Red, Color.Red,
//Color.OrangeRed, Color.OrangeRed,
//Color.Yellow, Color.Yellow,
Color.Green, Color.Green,
Color.Blue, Color.Blue,
//Color.Purple, Color.Purple,
//Color.DeepPink Color.DeepPink
}, LinearGradientMode.Horizontal); }, LinearGradientMode.Horizontal);
Initialized = true; Initialized = true;

23
Artemis/Artemis/Modules/Games/Dota2/Dota2DataModel.cs
View File

@ -85,6 +85,7 @@
public Ability1 ability1 { get; set; } public Ability1 ability1 { get; set; }
public Ability2 ability2 { get; set; } public Ability2 ability2 { get; set; }
public Ability3 ability3 { get; set; } public Ability3 ability3 { get; set; }
public Attributes attributes { get; set; } public Attributes attributes { get; set; }
} }
@ -132,28 +133,6 @@
public bool ultimate { get; set; } public bool ultimate { get; set; }
} }
public class Ability4
{
public string name { get; set; }
public int level { get; set; }
public bool can_cast { get; set; }
public bool passive { get; set; }
public bool ability_active { get; set; }
public int cooldown { get; set; }
public bool ultimate { get; set; }
}
public class Ability5
{
public string name { get; set; }
public int level { get; set; }
public bool can_cast { get; set; }
public bool passive { get; set; }
public bool ability_active { get; set; }
public int cooldown { get; set; }
public bool ultimate { get; set; }
}
public class Attributes public class Attributes
{ {
public int level { get; set; } public int level { get; set; }

7
Artemis/Artemis/Modules/Games/Dota2/Dota2View.xaml
View File

@ -6,8 +6,7 @@
xmlns:cal="http://www.caliburnproject.org" xmlns:cal="http://www.caliburnproject.org"
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d" mc:Ignorable="d" d:DesignWidth="635" Height="515.691">
d:DesignHeight="495" d:DesignWidth="635">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="0,0,0,-19"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="0,0,0,-19">
<Grid Margin="15, 5, 15, 5"> <Grid Margin="15, 5, 15, 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -46,8 +45,8 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1" <StackPanel Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2" Margin="0,0,1,0"> Grid.ColumnSpan="2" Margin="0,0,1,0">