sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Bring framework up-to-date.

Browse Source 
# Conflicts:
#	osu-framework
This commit is contained in:
Dean Herbert
2016-11-05 18:15:37 +09:00
parent bc53642cab
commit 2ee5e2efb7
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 2b9a56e8b3...6650f7fbbc

8
osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
View File

@ -153,7 +153,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Additive = true, BlendingMode = BlendingMode.Additive,
Alpha = 0.5f, Alpha = 0.5f,
} }
}; };
@ -203,7 +203,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Additive = true; BlendingMode = BlendingMode.Additive;
Alpha = 0; Alpha = 0;
Children = new Framework.Graphics.Drawable[] Children = new Framework.Graphics.Drawable[]
@ -225,7 +225,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Additive = true; BlendingMode = BlendingMode.Additive;
Alpha = 0; Alpha = 0;
Children = new Framework.Graphics.Drawable[] Children = new Framework.Graphics.Drawable[]
@ -296,7 +296,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
}, },
triangles = new Triangles triangles = new Triangles
{ {
Additive = true, BlendingMode = BlendingMode.Additive,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
}; };

2
osu.Game/GameModes/GameModeWhiteBox.cs
View File

@ -91,7 +91,7 @@ namespace osu.Game.GameModes
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = getColourFor(GetType()), Colour = getColourFor(GetType()),
Alpha = 1, Alpha = 1,
Additive = false BlendingMode = BlendingMode.Additive,
}, },
textContainer = new Container textContainer = new Container
{ {

2
osu.Game/GameModes/Menu/Intro.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.GameModes.Menu
logo = new OsuLogo() logo = new OsuLogo()
{ {
Alpha = 0, Alpha = 0,
Additive = true, BlendingMode = BlendingMode.Additive,
Interactive = false, Interactive = false,
Colour = Color4.DarkGray, Colour = Color4.DarkGray,
Ripple = false Ripple = false

4
osu.Game/GameModes/Menu/OsuLogo.cs
View File

@ -83,7 +83,7 @@ namespace osu.Game.GameModes.Menu
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Additive = true, BlendingMode = BlendingMode.Additive,
Alpha = 0.05f Alpha = 0.05f
} }
} }
@ -93,7 +93,7 @@ namespace osu.Game.GameModes.Menu
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = logo.Size, Size = logo.Size,
Additive = true, BlendingMode = BlendingMode.Additive,
Alpha = 0.2f, Alpha = 0.2f,
} }
} }

1
osu.Game/Graphics/Background/Background.cs
View File

@ -10,7 +10,6 @@ using OpenTK.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework; using osu.Framework;
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Framework.Graphics.Textures;
namespace osu.Game.Graphics.Background namespace osu.Game.Graphics.Background
{ {

2
osu.Game/Overlays/OptionsOverlay.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Overlays
new ScrollContainer new ScrollContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
ScrollDraggerOnLeft = true, ScrollDraggerAnchor = Anchor.TopLeft,
Children = new[] Children = new[]
{ {
new FlowContainer new FlowContainer

2
osu.Game/Overlays/ToolbarButton.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Overlays
HoverBackground = new Box HoverBackground = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Additive = true, BlendingMode = BlendingMode.Additive,
Colour = new Color4(60, 60, 60, 255), Colour = new Color4(60, 60, 60, 255),
Alpha = 0, Alpha = 0,
}, },