h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 07:22:54 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes

Browse Source
This commit is contained in:
Dean Herbert 2016-11-09 11:41:36 +09:00
commit d70e8806b4
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 478d0dd295a66c99556ca8039453e0f806ff4e9b
Subproject commit b8d0a0050be25aec4333134ca18497340e1154a7

4
osu.Game/GameModes/Play/Osu/OsuPlayfield.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.GameModes.Play.Osu
{
public class OsuPlayfield : Playfield
{
protected override Container Content => hitObjectContainer;
protected override Container<Drawable> Content => hitObjectContainer;
private Container hitObjectContainer;
@ -53,7 +53,7 @@ namespace osu.Game.GameModes.Play.Osu
class HitObjectContainer : Container
{
protected override Vector2 ChildScale => new Vector2(0.625f);
public override Vector2 ChildScale => new Vector2(0.625f);
}
}
}

2
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Graphics.Containers
private Container content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
protected override void Load(BaseGame game)
{

2
osu.Game/OsuGameBase.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game
public APIAccess API;
protected override Container Content => ratioContainer;
protected override Container<Drawable> Content => ratioContainer;
private RatioAdjust ratioContainer;

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

@ -27,7 +27,7 @@ namespace osu.Game.Overlays
private Container content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
private APIAccess api;

2
osu.Game/Overlays/Options/OptionsSection.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Options
public abstract class OptionsSection : Container
{
protected FlowContainer content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
public abstract FontAwesome Icon { get; }
protected abstract string Header { get; }

2
osu.Game/Overlays/Options/OptionsSidebar.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Options
public class OptionsSidebar : Container
{
private FlowContainer content;
protected override Container Content => content;
protected override Container<Drawable> Content => content;
public OptionsSidebar()
{

4
osu.Game/Overlays/Options/OptionsSubsection.cs
View File

@ -7,8 +7,8 @@ namespace osu.Game.Overlays.Options
{
public abstract class OptionsSubsection : Container
{
private Container content;
protected override Container Content => content;
private Container<Drawable> content;
protected override Container<Drawable> Content => content;
protected abstract string Header { get; }