Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Just2good/TFT-Overlay.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@Just2good
Just2good committed Jul 2, 2019
2 parents c4ec3fc + e27d0ae commit 31f53f8
Show file tree
Hide file tree
Showing 27 changed files with 9 additions and 51 deletions.
Binary file removed Images/classes/Assassin.png
View file
Binary file not shown.
Binary file removed Images/classes/Blademaster.png
View file
Binary file not shown.
Binary file removed Images/classes/Brawler.png
View file
Binary file not shown.
Binary file removed Images/classes/Elementalist.png
View file
Binary file not shown.
Binary file removed Images/classes/Guardian.png
View file
Binary file not shown.
Binary file removed Images/classes/Gunslinger.png
View file
Binary file not shown.
Binary file removed Images/classes/Knight.png
View file
Binary file not shown.
Binary file removed Images/classes/Ranger.png
View file
Binary file not shown.
Binary file removed Images/classes/Shapeshifter.png
View file
Binary file not shown.
Binary file removed Images/classes/Sorcerer.png
View file
Binary file not shown.
Binary file removed Images/origins/Demon.png
View file
Binary file not shown.
Binary file removed Images/origins/Dragon.png
View file
Binary file not shown.
Binary file removed Images/origins/Exile.png
View file
Binary file not shown.
Binary file removed Images/origins/Glacial.png
View file
Binary file not shown.
Binary file removed Images/origins/Imperial.png
View file
Binary file not shown.
Binary file removed Images/origins/Ninja.png
View file
Binary file not shown.
Binary file removed Images/origins/Noble.png
View file
Binary file not shown.
Binary file removed Images/origins/Phantom.png
View file
Binary file not shown.
Binary file removed Images/origins/Pirate.png
View file
Binary file not shown.
Binary file removed Images/origins/Robot.png
View file
Binary file not shown.
Binary file removed Images/origins/Void.png
View file
Binary file not shown.
Binary file removed Images/origins/Wild.png
View file
Binary file not shown.
Binary file removed Images/origins/Yordle.png
View file
Binary file not shown.
31 changes: 4 additions & 27 deletions MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,7 @@
<RowDefinition Height="25"/>
<RowDefinition Height="25"/>
</Grid.RowDefinitions>

<!--Border-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="6" />
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="6" />
Expand Down Expand Up @@ -1082,7 +1083,6 @@
<TextBlock Text="30%" Grid.Row="4" Grid.Column="2" FontSize="12" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="LawnGreen"></TextBlock>
<TextBlock Text="5%" Grid.Row="4" Grid.Column="3" FontSize="12" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Aqua"></TextBlock>


<TextBlock Text="Level 4" Grid.Row="5" Grid.Column="0" FontSize="12" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="LightGoldenrodYellow"></TextBlock>
<TextBlock Text="50%" Grid.Row="5" Grid.Column="1" FontSize="12" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"></TextBlock>
<TextBlock Text="35%" Grid.Row="5" Grid.Column="2" FontSize="12" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="LawnGreen"></TextBlock>
Expand Down Expand Up @@ -1173,31 +1173,18 @@

<!--Border-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 1 0 1" Grid.Row="0" Grid.ColumnSpan="9"/>
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="1" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="2" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="3" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="4" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="5" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="6" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="7" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="8" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="9" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="10" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="11" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="12" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="13" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="14" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="15" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="16" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="17" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="18" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="19" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="20" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="21" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="22" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="23" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="24" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="25" Grid.ColumnSpan="9" />-->

<TextBlock Text="Origins | Effects and Champions"
FontSize="16"
Expand All @@ -1216,7 +1203,7 @@
Foreground="LightGoldenrodYellow"
VerticalAlignment="Center"
TextWrapping="Wrap">
<Run Text="30% (2), 50% (4), 70% (6) on hit to burn all of target's"></Run>
<Run Text="40% (2), 60% (4), 80% (6) on hit to burn all of target's"></Run>
<Run Text="current mana" Foreground="DeepSkyBlue"></Run>
<Run Text=", dealing"></Run>
<Run Text="true damage" Foreground="White"></Run>
Expand Down Expand Up @@ -1561,7 +1548,7 @@
<Image Source="Images\champs\Rengar-Icon.png" Grid.Row="24" Grid.Column="4"></Image>
<TextBlock Text="3" Grid.Row="24" Grid.Column="4" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>

<Image Source="Images\champs\Gnar-Icon.png" Grid.Row="24" Grid.Column="4"></Image>
<Image Source="Images\champs\Gnar-Icon.png" Grid.Row="24" Grid.Column="5"></Image>
<TextBlock Text="4" Grid.Row="24" Grid.Column="5" FontSize="12" VerticalAlignment="Bottom" HorizontalAlignment="Left" Foreground="LightGoldenrodYellow" FontWeight="Bold"></TextBlock>


Expand Down Expand Up @@ -1626,7 +1613,7 @@
<RowDefinition Height="30"/>
<RowDefinition Height="50"/>
<RowDefinition Height="30"/>
<RowDefinition Height="40"/>
<RowDefinition Height="50"/>
<RowDefinition Height="30"/>
<RowDefinition Height="40"/>
<RowDefinition Height="30"/>
Expand All @@ -1646,25 +1633,15 @@

<!--Border-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 1 0 1" Grid.Row="0" Grid.ColumnSpan="9"/>
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="1" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="2" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="3" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="4" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="5" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="6" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="7" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="8" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="9" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="10" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="11" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="12" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="13" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="14" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="15" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="16" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="17" Grid.ColumnSpan="9" />-->
<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="18" Grid.ColumnSpan="9" Margin="0, 0, 0, -3" />
<!--<Border BorderBrush="LightGoldenrodYellow" BorderThickness="0 0 0 1" Grid.Row="19" Grid.ColumnSpan="9" />-->

<TextBlock Text="Classes | Effects and Champions"
FontSize="16"
Expand Down
2 changes: 1 addition & 1 deletion MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private void MenuItem_Click(object sender, RoutedEventArgs e)

private void MenuItem_Click_About(object sender, RoutedEventArgs e)
{
MessageBox.Show("TFT Information Overlay V1.6.2 by J2GKaze/Jinsoku#4019.\n\nDM me on Discord if you have any questions.\n\nBig thanks to Chaoticoz for Lock Window, Always on Top, and Mouseover.\n\nAlso thanks to, Asemco/Asemco#7390 for adding Origins and Classes!\n\nLast Updated: July 1st, 2019 @ 3:42PM PST");
MessageBox.Show("TFT Information Overlay V1.6.3 by J2GKaze/Jinsoku#4019.\n\nDM me on Discord if you have any questions.\n\nBig thanks to Chaoticoz for Lock Window, Always on Top, and Mouseover.\n\nAlso thanks to, Asemco/Asemco#7390 for adding Origins and Classes!\n\nLast Updated: July 2nd, 2019 @ 12:38AM PST");
}

private void MenuItem_Click_Lock(object sender, RoutedEventArgs e)
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ How to use:

Version History

7.2.2019
1.6.3
-Fixed wild origin (Rengar was missing)
-Updated Demon % Chance to burn mana (30/50/70 to 40/60/80)
7.1.2019
1.6.2
-Roll Chance changed to fit new patch
Expand Down
23 changes: 0 additions & 23 deletions TFT Overlay.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,51 +291,28 @@
<Resource Include="Images\champs\Yasuo-Icon.png" />
<Resource Include="Images\champs\Zed-Icon.png" />
<Resource Include="Images\classes\assassin.jpg" />
<Resource Include="Images\classes\Assassin.png" />
<Resource Include="Images\classes\blademaster.jpg" />
<Resource Include="Images\classes\Blademaster.png" />
<Resource Include="Images\classes\brawler.jpg" />
<Resource Include="Images\classes\Brawler.png" />
<Resource Include="Images\classes\elementalist.jpg" />
<Resource Include="Images\classes\Elementalist.png" />
<Resource Include="Images\classes\guardian.jpg" />
<Resource Include="Images\classes\Guardian.png" />
<Resource Include="Images\classes\gunslinger.jpg" />
<Resource Include="Images\classes\Gunslinger.png" />
<Resource Include="Images\classes\knight.jpg" />
<Resource Include="Images\classes\Knight.png" />
<Resource Include="Images\classes\ranger.jpg" />
<Resource Include="Images\classes\Ranger.png" />
<Resource Include="Images\classes\shapeshifter.jpg" />
<Resource Include="Images\classes\Shapeshifter.png" />
<Resource Include="Images\classes\sorcerer.jpg" />
<Resource Include="Images\classes\Sorcerer.png" />
<Resource Include="Images\origins\demon.jpg" />
<Resource Include="Images\origins\Demon.png" />
<Resource Include="Images\origins\dragon.jpg" />
<Resource Include="Images\origins\Dragon.png" />
<Resource Include="Images\origins\exile.jpg" />
<Resource Include="Images\origins\Exile.png" />
<Resource Include="Images\origins\glacial.jpg" />
<Resource Include="Images\origins\Glacial.png" />
<Resource Include="Images\origins\imperial.jpg" />
<Resource Include="Images\origins\Imperial.png" />
<Resource Include="Images\origins\ninja.jpg" />
<Resource Include="Images\origins\Ninja.png" />
<Resource Include="Images\origins\noble.jpg" />
<Resource Include="Images\origins\Noble.png" />
<Resource Include="Images\origins\phantom.jpg" />
<Resource Include="Images\origins\Phantom.png" />
<Resource Include="Images\origins\pirate.jpg" />
<Resource Include="Images\origins\Pirate.png" />
<Resource Include="Images\origins\robot.jpg" />
<Resource Include="Images\origins\Robot.png" />
<Resource Include="Images\origins\void.jpg" />
<Resource Include="Images\origins\Void.png" />
<Resource Include="Images\origins\wild.jpg" />
<Resource Include="Images\origins\Wild.png" />
<Resource Include="Images\origins\yordle.jpg" />
<Resource Include="Images\origins\Yordle.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\champs\ChoGath-Icon.png" />
Expand Down

0 comments on commit 31f53f8

Please sign in to comment.