Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Lock target feature #107

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
61ea024
Merge pull request #2 from xcsoftforlsharp/patch-1
myo Apr 16, 2016
40b25e7
1.0.0.2
brian0305 Apr 16, 2016
2560948
Merge branch 'master' of https://github.com/leaguesharp-devs/LeagueSh…
brian0305 Apr 16, 2016
c17c845
1.0.0.2
brian0305 Apr 16, 2016
6118c73
Adjusted namespaces, updated Damage, Interrupter, Gapcloser, and Targ…
ChewyMoon Apr 18, 2016
b9ac646
Removed analyzers
ChewyMoon Apr 18, 2016
7974ada
Revert "Removed analyzers"
Apr 18, 2016
6109172
Revert "Adjusted namespaces, updated Damage, Interrupter, Gapcloser, …
Apr 18, 2016
c02c56e
6.8
brian0305 Apr 20, 2016
a0d3939
better color
xcsoftforlsharp Apr 20, 2016
ba8032b
Merge pull request #4 from xcsoftforlsharp/patch-3
myo Apr 20, 2016
658498b
1.1.0.2
brian0305 Apr 21, 2016
242f240
1.1.0.3
brian0305 Apr 21, 2016
4ebbe36
1.1.0.4
brian0305 Apr 21, 2016
90332c6
Update Minion.cs
nabbhacker Apr 22, 2016
67acd5c
Update Spell.cs
nabbhacker Apr 22, 2016
952d81c
Merge pull request #5 from nabbhacker/master
myo Apr 22, 2016
ce1f8fa
1.1.0.5
brian0305 Apr 23, 2016
ca4394f
Add the translation (including dictionary)
N1ghtMoon Apr 23, 2016
cdaace8
Merge pull request #6 from CHA2172886/master
myo Apr 23, 2016
d638fd5
PastelComCoca - New target selector
Apr 24, 2016
6bde5b5
Update Damage.cs
nabbhacker Apr 24, 2016
ae2fdae
Merge pull request #7 from nabbhacker/master
zezzy Apr 24, 2016
ad23e24
fixed Irelia last hitting
myo Apr 26, 2016
ae7e268
fixed Irelia AA damage
Apr 26, 2016
4f5c1e3
Added few animations
Screeder Apr 26, 2016
f9afe34
Fix Menu Width and add Lock Target Translation
N1ghtMoon Apr 27, 2016
a464dad
Merge pull request #8 from CHA2172886/master
myo Apr 27, 2016
aaeada6
faster lucian assemblies :klappa:
Apr 27, 2016
99d7c06
Exhaust Damage is currently off
myo Apr 27, 2016
e4f9c61
fixed exhaust damage reduction
myo Apr 27, 2016
222d6ae
Finally fixed exhaust.
Apr 27, 2016
45c3e2e
InAutoAttackRange for @sebby
Apr 28, 2016
94efbf8
1.1.0.11
brian0305 May 3, 2016
f84786e
Added Animations, fixed nullptr in Render
Screeder May 3, 2016
122a5d1
Prediction
brian0305 May 5, 2016
aed8d78
Old stuff
brian0305 May 5, 2016
9c9cfb5
Prevent Orbwalker when shop open
brian0305 May 5, 2016
4f3d5a9
Removed debug messages
Screeder May 6, 2016
6f4c272
Improved Anti-Gapcloser
myo May 11, 2016
7087739
fixed compile error issued by the last commit
myo May 11, 2016
8cc13ed
Changed version so everyone gets the new antigapcloser
myo May 11, 2016
d6e19d8
Prediction
brian0305 May 14, 2016
a164545
LeagueSharp > LeagueSharp.SDKEx
May 14, 2016
0563b72
Revert "LeagueSharp > LeagueSharp.SDKEx"
May 14, 2016
ffc4755
Fixed cache
ChewyMoon May 14, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Core/Bootstrap.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

namespace LeagueSharp.SDK
{
using System.Globalization;
using System.Security.Permissions;
using System.Threading;

using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.UI;
using LeagueSharp.SDK.UI.Skins;
using LeagueSharp.SDK.Utils;
using System.Globalization;
using System.Security.Permissions;
using System.Threading;

/// <summary>
/// Bootstrap is an initialization pointer for the AppDomainManager to initialize the library correctly once loaded in
Expand Down Expand Up @@ -100,6 +100,10 @@ public static void Init(string[] args)
Damage.Initialize();
Logging.Write()(LogLevel.Info, "[SDK Bootstrap] Damage Library Initialized.");

// Load Language
MultiLanguage.LoadTranslation();
Logging.Write()(LogLevel.Info, "[SDK Bootstrap] MultiLanguage Initialized");

// Final notification.
Logging.Write()(LogLevel.Info, "[-- SDK Bootstrap Loading --]");
}
Expand Down
10 changes: 5 additions & 5 deletions Core/UI/IMenu/Skins/Blue/BlueBool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

using SharpDX;
using SharpDX.Direct3D9;

Expand Down Expand Up @@ -89,12 +89,12 @@ public override void Draw()
var centerY =
(int)
BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter)
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter)
.Y;

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(this.Component.Position.X + MenuSettings.ContainerTextOffset),
centerY,
MenuSettings.TextColor);
Expand Down Expand Up @@ -125,11 +125,11 @@ public override void Draw()
MenuSettings.ContainerHeight).GetCenteredText(
null,
MenuSettings.Font,
this.Component.Value ? "On" : "Off",
MultiLanguage.Translation(this.Component.Value ? "On" : "Off"),
CenteredFlags.HorizontalCenter).X;
MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.Value ? "On" : "Off",
MultiLanguage.Translation(this.Component.Value ? "On" : "Off"),
centerX,
centerY,
this.Component.Value ? new ColorBGRA(0, 27, 41, 255) : MenuSettings.TextColor);
Expand Down
8 changes: 4 additions & 4 deletions Core/UI/IMenu/Skins/Blue/BlueButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

using SharpDX;
using SharpDX.Direct3D9;

Expand Down Expand Up @@ -114,11 +114,11 @@ public override void Dispose()
public override void Draw()
{
var rectangleName = BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter);
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter);

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(this.Component.Position.X + MenuSettings.ContainerTextOffset),
(int)rectangleName.Y,
MenuSettings.TextColor);
Expand Down Expand Up @@ -157,7 +157,7 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.ButtonText,
MultiLanguage.Translation(this.Component.ButtonText),
(int)(this.Component.Position.X + this.Component.MenuWidth - buttonTextWidth - TextGap),
(int)rectangleName.Y,
MenuSettings.TextColor);
Expand Down
14 changes: 7 additions & 7 deletions Core/UI/IMenu/Skins/Blue/BlueColorPicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace LeagueSharp.SDK.UI.Skins.Blue
using Color = SharpDX.Color;
using Rectangle = SharpDX.Rectangle;
using Utilities = LeagueSharp.SDK.UI.Utilities;

using Core.Utils;
internal class BlueColorPicker : ADrawable<MenuColor>
{
#region Constants
Expand Down Expand Up @@ -216,11 +216,11 @@ public override void Dispose()
public override void Draw()
{
var rectangleName = BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter);
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter);

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(this.Component.Position.X + MenuSettings.ContainerTextOffset),
(int)rectangleName.Y,
MenuSettings.TextColor);
Expand Down Expand Up @@ -319,11 +319,11 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
"Apply",
MultiLanguage.Translation("Apply"),
this.ApplyButtonBoundaries().X - applyButtonTextWidth / 2 + 25,
(int)
this.CancelButtonBoundaries()
.GetCenteredText(null, MenuSettings.Font, "Apply", CenteredFlags.VerticalCenter)
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation("Apply"), CenteredFlags.VerticalCenter)
.Y,
new ColorBGRA(0, 27, 41, 255));

Expand All @@ -342,11 +342,11 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
"Cancel",
MultiLanguage.Translation("Cancel"),
this.CancelButtonBoundaries().X - cancelButtonTextWidth / 2 + 25,
(int)
this.CancelButtonBoundaries()
.GetCenteredText(null, MenuSettings.Font, "Cancel", CenteredFlags.VerticalCenter)
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation("Cancel"), CenteredFlags.VerticalCenter)
.Y,
new ColorBGRA(0, 27, 41, 255));
});
Expand Down
10 changes: 5 additions & 5 deletions Core/UI/IMenu/Skins/Blue/BlueKeyBind.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace LeagueSharp.SDK.UI.Skins.Blue

using SharpDX;
using SharpDX.Direct3D9;

using Core.Utils;
/// <summary>
/// A default implementation of <see cref="ADrawable{MenuKeyBind}" />
/// </summary>
Expand Down Expand Up @@ -91,11 +91,11 @@ public override void Draw()
var centerY =
(int)
BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter)
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter)
.Y;
MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.Interacting ? "Press a key" : this.Component.DisplayName,
MultiLanguage.Translation(this.Component.Interacting ? "Press a key" : this.Component.DisplayName),
(int)(this.Component.Position.X + MenuSettings.ContainerTextOffset),
centerY,
MenuSettings.TextColor);
Expand Down Expand Up @@ -139,11 +139,11 @@ public override void Draw()
MenuSettings.ContainerHeight).GetCenteredText(
null,
MenuSettings.Font,
this.Component.Active ? "On" : "Off",
MultiLanguage.Translation(this.Component.Active ? "On" : "Off"),
CenteredFlags.HorizontalCenter).X;
MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.Active ? "On" : "Off",
MultiLanguage.Translation(this.Component.Active ? "On" : "Off"),
centerX,
centerY,
this.Component.Active ? new ColorBGRA(0, 27, 41, 255) : MenuSettings.TextColor);
Expand Down
13 changes: 6 additions & 7 deletions Core/UI/IMenu/Skins/Blue/BlueList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using System.Collections.Generic;

using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

using SharpDX;
using SharpDX.Direct3D9;
using System.Collections.Generic;

/// <summary>
/// A default implementation of a <see cref="ADrawable{MenuList}" />
Expand Down Expand Up @@ -102,11 +101,11 @@ public override void Draw()
var dropdownMenuWidth = this.dropDownButtonWidth + (2 * TextSpacing) + this.Component.MaxStringWidth;
var position = this.Component.Position;
var rectangleName = BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter);
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter);

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(position.X + MenuSettings.ContainerTextOffset),
(int)rectangleName.Y,
MenuSettings.TextColor);
Expand All @@ -120,7 +119,7 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.SelectedValueAsObject.ToString(),
MultiLanguage.Translation(this.Component.SelectedValueAsObject.ToString()),
(int)position.X + this.Component.MenuWidth - this.dropDownButtonWidth - TextSpacing
- this.Component.MaxStringWidth,
(int)rectangleName.Y,
Expand Down Expand Up @@ -210,7 +209,7 @@ public override void Draw()
y += MenuSettings.ContainerHeight;
MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
valueStrings[i],
MultiLanguage.Translation(valueStrings[i]),
x,
y,
MenuSettings.TextColor);
Expand Down
7 changes: 3 additions & 4 deletions Core/UI/IMenu/Skins/Blue/BlueMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using System.Linq;

using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

using SharpDX;
using SharpDX.Direct3D9;
using System.Linq;

/// <summary>
/// Provides a default implementation of <see cref="ADrawable{Menu}" />
Expand Down Expand Up @@ -130,7 +129,7 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(position.X + MenuSettings.ContainerTextOffset),
centerY,
MenuSettings.TextColor);
Expand Down
5 changes: 3 additions & 2 deletions Core/UI/IMenu/Skins/Blue/BlueSeparator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

Expand Down Expand Up @@ -64,12 +65,12 @@ public override void Draw()
.GetCenteredText(
null,
BlueMenuSettings.FontCaption,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
CenteredFlags.VerticalCenter | CenteredFlags.HorizontalCenter);

BlueMenuSettings.FontCaption.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)centerY.X,
(int)centerY.Y,
BlueMenuSettings.TextCaptionColor);
Expand Down
11 changes: 5 additions & 6 deletions Core/UI/IMenu/Skins/Blue/BlueSlider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using System;
using System.Globalization;

using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

using SharpDX;
using SharpDX.Direct3D9;
using System;
using System.Globalization;

/// <summary>
/// A default implementation of an <see cref="ADrawable{MenuSlider}" />
Expand Down Expand Up @@ -104,7 +103,7 @@ public override void Draw()
var centeredY =
(int)
BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter)
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter)
.Y;
var percent = (this.Component.Value - this.Component.MinValue)
/ (float)(this.Component.MaxValue - this.Component.MinValue);
Expand All @@ -119,7 +118,7 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(position.X + MenuSettings.ContainerTextOffset),
centeredY,
MenuSettings.TextColor);
Expand Down
13 changes: 6 additions & 7 deletions Core/UI/IMenu/Skins/Blue/BlueSliderButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using System;
using System.Globalization;

using Core.Utils;
using LeagueSharp.SDK.Enumerations;
using LeagueSharp.SDK.Utils;

using SharpDX;
using SharpDX.Direct3D9;
using System;
using System.Globalization;

/// <summary>
/// A default implementation of an <see cref="ADrawable{MenuSliderButton}" />
Expand Down Expand Up @@ -100,7 +99,7 @@ public override void Draw()
var centeredY =
(int)
BlueUtilities.GetContainerRectangle(this.Component)
.GetCenteredText(null, MenuSettings.Font, this.Component.DisplayName, CenteredFlags.VerticalCenter)
.GetCenteredText(null, MenuSettings.Font, MultiLanguage.Translation(this.Component.DisplayName), CenteredFlags.VerticalCenter)
.Y;
var percent = (this.Component.SValue - this.Component.MinValue)
/ (float)(this.Component.MaxValue - this.Component.MinValue);
Expand All @@ -116,7 +115,7 @@ public override void Draw()

MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.DisplayName,
MultiLanguage.Translation(this.Component.DisplayName),
(int)(position.X + MenuSettings.ContainerTextOffset),
centeredY,
MenuSettings.TextColor);
Expand Down Expand Up @@ -175,7 +174,7 @@ public override void Draw()
CenteredFlags.HorizontalCenter).X;
MenuSettings.Font.DrawText(
MenuManager.Instance.Sprite,
this.Component.BValue ? "On" : "Off",
MultiLanguage.Translation(this.Component.BValue ? "ON" : "OFF"),
centerX,
centeredY,
this.Component.BValue ? new ColorBGRA(0, 27, 41, 255) : MenuSettings.TextColor);
Expand Down
5 changes: 3 additions & 2 deletions Core/UI/IMenu/Skins/Blue/BlueUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

namespace LeagueSharp.SDK.UI.Skins.Blue
{
using Core.Utils;
using SharpDX;

/// <summary>
Expand All @@ -38,7 +39,7 @@ public class BlueUtilities
/// <returns>The width</returns>
public static int CalcWidthItem(MenuItem menuItem)
{
return (int)(MeasureString(menuItem.DisplayName).Width + (MenuSettings.ContainerTextOffset * 2));
return (int)(MeasureString(MultiLanguage.Translation(menuItem.DisplayName)).Width + (MenuSettings.ContainerTextOffset * 2));
}

/// <summary>
Expand All @@ -48,7 +49,7 @@ public static int CalcWidthItem(MenuItem menuItem)
/// <returns>The <see cref="int" /></returns>
public static int CalcWidthText(string text)
{
return MenuSettings.Font.MeasureText(MenuManager.Instance.Sprite, text, 0).Width;
return MenuSettings.Font.MeasureText(MenuManager.Instance.Sprite, MultiLanguage.Translation(text), 0).Width;
}

/// <summary>
Expand Down
Loading