h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 06:57:25 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into infrastructure

Browse Source
This commit is contained in:
Dan Balasescu 2019-11-11 16:02:05 +09:00 committed by GitHub
commit f27398e899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
View File

@ -3,7 +3,6 @@
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Tournament.Models; using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.TeamIntro; using osu.Game.Tournament.Screens.TeamIntro;
@ -13,7 +12,7 @@ namespace osu.Game.Tournament.Tests.Screens
public class TestSceneTeamIntroScreen : LadderTestScene public class TestSceneTeamIntroScreen : LadderTestScene
{ {
[Cached] [Cached]
private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>(); private readonly LadderInfo ladder = new LadderInfo();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
@ -22,7 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA"); match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA");
match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN"); match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN");
match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals"); match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
currentMatch.Value = match; ladder.CurrentMatch.Value = match;
Add(new TeamIntroScreen Add(new TeamIntroScreen
{ {

5
osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
View File

@ -3,7 +3,6 @@
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Tournament.Models; using osu.Game.Tournament.Models;
using osu.Game.Tournament.Screens.TeamWin; using osu.Game.Tournament.Screens.TeamWin;
@ -13,7 +12,7 @@ namespace osu.Game.Tournament.Tests.Screens
public class TestSceneTeamWinScreen : LadderTestScene public class TestSceneTeamWinScreen : LadderTestScene
{ {
[Cached] [Cached]
private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>(); private readonly LadderInfo ladder = new LadderInfo();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
@ -22,7 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA"); match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA");
match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN"); match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN");
match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals"); match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
currentMatch.Value = match; ladder.CurrentMatch.Value = match;
Add(new TeamWinScreen Add(new TeamWinScreen
{ {

4
osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
View File

@ -64,6 +64,10 @@ namespace osu.Game.Rulesets.Edit
drawableRuleset.Playfield.PostProcess(); drawableRuleset.Playfield.PostProcess();
} }
public override bool PropagatePositionalInputSubTree => false;
public override bool PropagateNonPositionalInputSubTree => false;
public PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => drawableRuleset.CreatePlayfieldAdjustmentContainer(); public PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => drawableRuleset.CreatePlayfieldAdjustmentContainer();
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)