RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into stateful-drawables 

Conflicts:
	osu.Game/GameModes/Menu/Intro.cs
This commit is contained in:
Dean Herbert 2016-10-09 22:08:32 +09:00
parent 926c46dbd4 de24c86c81
commit 25de055802
9 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 6b884e1b80444c5249754634a4b5529c50b52934
Subproject commit 1f770847b245e6d250e63e60c24e9e84131d15e7

23
osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
View File

@ -19,17 +19,22 @@ public override void Reset()
{
base.Reset();
KeyCounterCollection kc = new KeyCounterCollection
Children = new[]
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
IsCounting = true
new KeyCounterCollection
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
IsCounting = true,
Counters = new KeyCounter[]
{
new KeyCounterKeyboard(@"Z", Key.Z),
new KeyCounterKeyboard(@"X", Key.X),
new KeyCounterMouse(@"M1", MouseButton.Left),
new KeyCounterMouse(@"M2", MouseButton.Right),
},
},
};
Add(kc);
kc.AddKey(new KeyCounterKeyboard(@"Z", Key.Z));
kc.AddKey(new KeyCounterKeyboard(@"X", Key.X));
kc.AddKey(new KeyCounterMouse(@"M1", MouseButton.Left));
kc.AddKey(new KeyCounterMouse(@"M2", MouseButton.Right));
}
}
}

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

@ -106,14 +106,17 @@ public override void Load()
buttonFlow.Position = new Vector2(wedge_width * 2 - (button_width + osuLogo.SizeForFlow / 4), 0);
buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P)));
buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), OnMulti, 0, Key.M)));
buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), OnChart)));
buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), OnSolo, wedge_width, Key.P));
buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), OnMulti, 0, Key.M));
buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), OnChart));
buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P)));
buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), OnEdit, 0, Key.E)));
buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), OnDirect, 0, Key.D)));
buttonsTopLevel.Add((Button)buttonFlow.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q)));
buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, wedge_width, Key.P));
buttonsTopLevel.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), OnEdit, 0, Key.E));
buttonsTopLevel.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), OnDirect, 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
buttonFlow.Add(buttonsPlay);
buttonFlow.Add(buttonsTopLevel);
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)

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

@ -44,18 +44,18 @@ public override void Load()
AudioTrack bgm = Game.Audio.Track.Get(@"circles");
bgm.Looping = true;
Game.Scheduler.Add(delegate
Scheduler.Add(delegate
{
welcome.Play();
}, true);
Game.Scheduler.AddDelayed(delegate
Scheduler.AddDelayed(delegate
{
bgm.Start();
}, 600);
Game.Scheduler.AddDelayed(delegate
Scheduler.AddDelayed(delegate
{
DidLoadMenu = true;
Push(new MainMenu());
@ -82,7 +82,7 @@ protected override bool OnExiting(GameMode next)
protected override void OnResuming(GameMode last)
{
//we are just an intro. if we are resumed, we just want to exit after a short delay (to allow the last mode to transition out).
Game.Scheduler.AddDelayed(Exit, 600);
Scheduler.AddDelayed(Exit, 600);
base.OnResuming(last);
}

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

@ -45,7 +45,7 @@ public override void Load()
OnSolo = delegate { Push(new PlaySongSelect()); },
OnMulti = delegate { Push(new Lobby()); },
OnTest = delegate { Push(new TestBrowser()); },
OnExit = delegate { Game.Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); },
OnExit = delegate { Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); },
OnSettings = delegate {
osu.Options.PoppedOut = !osu.Options.PoppedOut;
},

3
osu.Game/GameModes/OsuGameMode.cs
View File

@ -41,7 +41,7 @@ protected override void OnEntering(GameMode last)
}
else if (bg != null)
{
AddTopLevel(new ParallaxContainer
AddInternal(new ParallaxContainer
{
Depth = float.MinValue,
Children = new[]
@ -51,7 +51,6 @@ protected override void OnEntering(GameMode last)
});
}
base.OnEntering(last);
}

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

@ -14,21 +14,21 @@ class ParallaxContainer : Container
public ParallaxContainer()
{
RelativeSizeAxes = Axes.Both;
AddInternal(content = new Container()
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre
});
}
private Container content = new Container()
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre
};
private Container content;
protected override Container AddTarget => content;
protected override Container Content => content;
public override void Load()
{
base.Load();
Add(content);
}
protected override bool OnMouseMove(InputState state)

15
osu.Game/Graphics/UserInterface/KeyCounterCollection.cs
View File

@ -22,18 +22,19 @@ public IEnumerable<KeyCounter> Counters
set
{
foreach (var k in value)
AddKey(k);
addKey(k);
Children = value;
}
}
public void AddKey(KeyCounter key)
private void addKey(KeyCounter key)
{
counters.Add(key);
key.IsCounting = this.IsCounting;
key.FadeTime = this.FadeTime;
key.KeyDownTextColor = this.KeyDownTextColor;
key.KeyUpTextColor = this.KeyUpTextColor;
base.Add(key);
key.IsCounting = IsCounting;
key.FadeTime = FadeTime;
key.KeyDownTextColor = KeyDownTextColor;
key.KeyUpTextColor = KeyUpTextColor;
}
public void ResetCount()

2
osu.Game/OsuGameBase.cs
View File

@ -21,7 +21,7 @@ public class OsuGameBase : Framework.Game
public Options Options;
public APIAccess API;
protected override Container AddTarget => ratioContainer?.IsLoaded == true ? ratioContainer : base.AddTarget;
protected override Container Content => ratioContainer?.IsLoaded == true ? ratioContainer : base.Content;
private RatioAdjust ratioContainer;