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

Merge branch 'master' into autoreplay-refactor-squashed

Browse Source
This commit is contained in:
Dean Herbert 2017-04-24 13:20:24 +09:00 committed by GitHub
commit c392e35ea6
7 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.vscode/launch.json vendored
View File

@ -3,6 +3,9 @@
"configurations": [ "configurations": [
{ {
"name": "Launch VisualTests", "name": "Launch VisualTests",
"windows": {
"type": "clr"
},
"type": "mono", "type": "mono",
"request": "launch", "request": "launch",
"program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe", "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe",
@ -15,6 +18,9 @@
}, },
{ {
"name": "Launch Desktop", "name": "Launch Desktop",
"windows": {
"type": "clr"
},
"type": "mono", "type": "mono",
"request": "launch", "request": "launch",
"program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe", "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
@ -27,6 +33,11 @@
}, },
{ {
"name": "Attach", "name": "Attach",
"windows": {
"type": "clr",
"request": "attach",
"processName": "osu!"
},
"type": "mono", "type": "mono",
"request": "attach", "request": "attach",
"address": "localhost", "address": "localhost",

18
.vscode/tasks.json vendored
View File

@ -11,7 +11,23 @@
"command": "msbuild", "command": "msbuild",
"args": [ "args": [
// Ask msbuild to generate full paths for file names. // Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true" "/property:GenerateFullPaths=true",
"/property:DebugType=portable"
],
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile",
"isBuildCommand": true
},
{
"taskName": "rebuild",
"isShellCommand": true,
"showOutput": "silent",
"command": "msbuild",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/target:Clean,Build"
], ],
// Use the standard MS compiler pattern to detect errors, warnings and infos // Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile", "problemMatcher": "$msCompile",

2
osu-framework

@ -1 +1 @@
Subproject commit b4e1b9a0eb1782ab8cfc48e305fd295a25c0579e Subproject commit 9204b838504a51ffe7577c103b91270a2687bfb8

2
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps
public readonly BeatmapSetInfo BeatmapSetInfo; public readonly BeatmapSetInfo BeatmapSetInfo;
public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>(); public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>(new Mod[] { });
public readonly bool WithStoryboard; public readonly bool WithStoryboard;

1
osu.Game/OsuGameBase.cs
View File

@ -149,6 +149,7 @@ namespace osu.Game
{ {
new Container new Container
{ {
AlwaysReceiveInput = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Depth = float.MinValue, Depth = float.MinValue,
Children = new Drawable[] Children = new Drawable[]

3
osu.Game/Overlays/MusicController.cs
View File

@ -22,6 +22,7 @@ using osu.Game.Database;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Framework.Extensions;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
namespace osu.Game.Overlays namespace osu.Game.Overlays
@ -293,7 +294,7 @@ namespace osu.Game.Overlays
trackManager.SetExclusive(current.Track); trackManager.SetExclusive(current.Track);
current.Track.Start(); current.Track.Start();
beatmapSource.Value = current; beatmapSource.Value = current;
}); }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted()), TaskContinuationOptions.OnlyOnFaulted);
updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
} }

12
osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
View File

@ -12,8 +12,8 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
{ {
protected override string Header => "Layout"; protected override string Header => "Layout";
private OptionSlider<int> letterboxPositionX; private OptionSlider<double> letterboxPositionX;
private OptionSlider<int> letterboxPositionY; private OptionSlider<double> letterboxPositionY;
private Bindable<bool> letterboxing; private Bindable<bool> letterboxing;
@ -35,15 +35,15 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
LabelText = "Letterboxing", LabelText = "Letterboxing",
Bindable = letterboxing, Bindable = letterboxing,
}, },
letterboxPositionX = new OptionSlider<int> letterboxPositionX = new OptionSlider<double>
{ {
LabelText = "Horizontal position", LabelText = "Horizontal position",
Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionX) Bindable = config.GetBindable<double>(FrameworkConfig.LetterboxPositionX)
}, },
letterboxPositionY = new OptionSlider<int> letterboxPositionY = new OptionSlider<double>
{ {
LabelText = "Vertical position", LabelText = "Vertical position",
Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionY) Bindable = config.GetBindable<double>(FrameworkConfig.LetterboxPositionY)
}, },
}; };