h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 21:27:24 +08:00
Code Issues Releases Wiki Activity

Bring framework up-to-date.

Browse Source
This commit is contained in:
Dean Herbert 2016-09-21 13:12:05 +09:00
parent e0c06a4f19
commit f1688499e4
9 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 0ca3fe2b5d20f9aa71ef8a65cd9a676d5d3035e3 Subproject commit 556bf7e3c1f50cac0b9924300eaf97ecae4aece7

10
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -298,14 +298,16 @@ namespace osu.Game.GameModes.Menu
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
logo = new Sprite(Game.Textures.Get(@"menu-osu")) logo = new Sprite
{ {
Anchor = Anchor.Centre, Texture = Game.Textures.Get(@"menu-osu"),
Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}, },
ripple = new Sprite(Game.Textures.Get(@"menu-osu")) ripple = new Sprite
{ {
Anchor = Anchor.Centre, Texture = Game.Textures.Get(@"menu-osu"),
Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Alpha = 0.4f Alpha = 0.4f
}, },

3
osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs
View File

@ -69,8 +69,9 @@ namespace osu.Game.GameModes.Play.Catch
foreach (CatchBaseHit h in objects) foreach (CatchBaseHit h in objects)
{ {
//render stuff! //render stuff!
Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) Sprite s = new Sprite
{ {
Texture = Game.Textures.Get(@"menu-osu"),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(0.1f), Scale = new Vector2(0.1f),
PositionMode = InheritMode.Y, PositionMode = InheritMode.Y,

2
osu.Game/GameModes/Play/Catch/CatchPlayfield.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.GameModes.Play.Catch
{ {
base.Load(); base.Load();
Add(new Box() { SizeMode = InheritMode.XY, Alpha = 0.5f }); Add(new Box { SizeMode = InheritMode.XY, Alpha = 0.5f });
} }
} }
} }

3
osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs
View File

@ -75,8 +75,9 @@ namespace osu.Game.GameModes.Play.Mania
foreach (ManiaBaseHit h in objects) foreach (ManiaBaseHit h in objects)
{ {
//render stuff! //render stuff!
Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) Sprite s = new Sprite
{ {
Texture = Game.Textures.Get(@"menu-osu"),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(0.1f), Scale = new Vector2(0.1f),
PositionMode = InheritMode.XY, PositionMode = InheritMode.XY,

3
osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs
View File

@ -47,8 +47,9 @@ namespace osu.Game.GameModes.Play.Osu
foreach (OsuBaseHit h in objects) foreach (OsuBaseHit h in objects)
{ {
//render stuff! //render stuff!
Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) Sprite s = new Sprite
{ {
Texture = Game.Textures.Get(@"menu-osu"),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(0.1f), Scale = new Vector2(0.1f),
Alpha = 0, Alpha = 0,

7
osu.Game/GameModes/Play/Playfield.cs
View File

@ -1,16 +1,11 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
namespace osu.Game.GameModes.Play namespace osu.Game.GameModes.Play
{ {
public class Playfield : MaskingContainer public class Playfield : Container
{ {
} }
} }

3
osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs
View File

@ -68,8 +68,9 @@ namespace osu.Game.GameModes.Play.Taiko
foreach (TaikoBaseHit h in objects) foreach (TaikoBaseHit h in objects)
{ {
//render stuff! //render stuff!
Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) Sprite s = new Sprite
{ {
Texture = Game.Textures.Get(@"menu-osu"),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(0.2f), Scale = new Vector2(0.2f),
PositionMode = InheritMode.XY, PositionMode = InheritMode.XY,

5
osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs
View File

@ -24,10 +24,11 @@ namespace osu.Game.GameModes.Play.Taiko
{ {
base.Load(); base.Load();
Add(new Box() { SizeMode = InheritMode.XY, Alpha = 0.5f }); Add(new Box { SizeMode = InheritMode.XY, Alpha = 0.5f });
Add(new Sprite(Game.Textures.Get(@"menu-osu")) Add(new Sprite
{ {
Texture = Game.Textures.Get(@"menu-osu"),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(0.2f), Scale = new Vector2(0.2f),
PositionMode = InheritMode.XY, PositionMode = InheritMode.XY,