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

Merge pull request #668 from peppy/general-fixes

Browse Source 
General fixes
This commit is contained in:
Dan Balasescu 2017-04-25 08:14:44 +09:00 committed by GitHub
commit 39ff081ff9
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.vscode/tasks.json vendored
View File

@ -10,10 +10,16 @@
"showOutput": "silent", "showOutput": "silent",
"command": "msbuild", "command": "msbuild",
"args": [ "args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true", "/property:GenerateFullPaths=true",
"/property:DebugType=portable" "/property:DebugType=portable"
], ],
"windows": {
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/m" //parallel compiling support. doesn't work well with mono atm
]
},
// 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",
"isBuildCommand": true "isBuildCommand": true
@ -29,6 +35,14 @@
"/property:DebugType=portable", "/property:DebugType=portable",
"/target:Clean,Build" "/target:Clean,Build"
], ],
"windows": {
"args": [
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/target:Clean,Build",
"/m" //parallel compiling support. doesn't work well with mono atm
]
},
// 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",
"isBuildCommand": true "isBuildCommand": true

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

@ -294,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); }).ContinueWith(task => Schedule(task.ThrowIfFaulted), TaskContinuationOptions.OnlyOnFaulted);
updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
} }

2
osu.Game/Screens/Play/PlayerInputManager.cs
View File

@ -38,8 +38,6 @@ namespace osu.Game.Screens.Play
protected override void Update() protected override void Update()
{ {
base.Update();
if (parentClock == null) return; if (parentClock == null) return;
clock.Rate = parentClock.Rate; clock.Rate = parentClock.Rate;