h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-04 00:14:12 +08:00
Code Issues 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
Unverified
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
osu-framework
+1 -1
Submodule osu-framework updated: 2b9a56e8b3...6650f7fbbc
osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
+4 -4
View File
@@ -153,7 +153,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Additive = true,
BlendingMode = BlendingMode.Additive,
Alpha = 0.5f,
}
};
@@ -203,7 +203,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Additive = true;
BlendingMode = BlendingMode.Additive;
Alpha = 0;
Children = new Framework.Graphics.Drawable[]
@@ -225,7 +225,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Additive = true;
BlendingMode = BlendingMode.Additive;
Alpha = 0;
Children = new Framework.Graphics.Drawable[]
@@ -296,7 +296,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable
},
triangles = new Triangles
{
Additive = true,
BlendingMode = BlendingMode.Additive,
RelativeSizeAxes = Axes.Both,
},
};
osu.Game/GameModes/GameModeWhiteBox.cs
+1 -1
View File
@@ -91,7 +91,7 @@ namespace osu.Game.GameModes
Origin = Anchor.Centre,
Colour = getColourFor(GetType()),
Alpha = 1,
Additive = false
BlendingMode = BlendingMode.Additive,
},
textContainer = new Container
{
osu.Game/GameModes/Menu/Intro.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace osu.Game.GameModes.Menu
logo = new OsuLogo()
{
Alpha = 0,
Additive = true,
BlendingMode = BlendingMode.Additive,
Interactive = false,
Colour = Color4.DarkGray,
Ripple = false
osu.Game/GameModes/Menu/OsuLogo.cs
+2 -2
View File
@@ -83,7 +83,7 @@ namespace osu.Game.GameModes.Menu
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Additive = true,
BlendingMode = BlendingMode.Additive,
Alpha = 0.05f
}
}
@@ -93,7 +93,7 @@ namespace osu.Game.GameModes.Menu
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = logo.Size,
Additive = true,
BlendingMode = BlendingMode.Additive,
Alpha = 0.2f,
}
}
osu.Game/Graphics/Background/Background.cs
-1
View File
@@ -10,7 +10,6 @@ using OpenTK.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework;
using System.Threading.Tasks;
using osu.Framework.Graphics.Textures;
namespace osu.Game.Graphics.Background
{
osu.Game/Overlays/OptionsOverlay.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
ScrollDraggerOnLeft = true,
ScrollDraggerAnchor = Anchor.TopLeft,
Children = new[]
{
new FlowContainer
osu.Game/Overlays/ToolbarButton.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays
HoverBackground = new Box
{
RelativeSizeAxes = Axes.Both,
Additive = true,
BlendingMode = BlendingMode.Additive,
Colour = new Color4(60, 60, 60, 255),
Alpha = 0,
},