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

Merge branch 'master' into more-taiko-relative-sizings

Browse Source
This commit is contained in:
smoogipooo 2017-04-10 14:43:17 +09:00
commit f587fe91d2
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@ -11,7 +11,7 @@
"preLaunchTask": "build", "preLaunchTask": "build",
"runtimeExecutable": null, "runtimeExecutable": null,
"env": {}, "env": {},
"externalConsole": false "console": "internalConsole"
}, },
{ {
"name": "Launch Desktop", "name": "Launch Desktop",
@ -23,7 +23,7 @@
"preLaunchTask": "build", "preLaunchTask": "build",
"runtimeExecutable": null, "runtimeExecutable": null,
"env": {}, "env": {},
"externalConsole": false "console": "internalConsole"
}, },
{ {
"name": "Attach", "name": "Attach",

20
.vscode/tasks.json vendored
View File

@ -2,25 +2,23 @@
// See https://go.microsoft.com/fwlink/?LinkId=733558 // See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format // for the documentation about the tasks.json format
"version": "0.1.0", "version": "0.1.0",
"taskSelector": "/t:",
"tasks": [
{
"taskName": "build",
"isShellCommand": true,
"showOutput": "silent",
"command": "xbuild",
"windows": { "windows": {
"command": "msbuild" "command": "msbuild"
}, },
"linux": {
"command": "xbuild"
},
"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"
], ],
"taskSelector": "/t:",
"showOutput": "silent",
"tasks": [
{
"taskName": "build",
// Show the output window only if unrecognized errors occur.
"showOutput": "silent",
// 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
} }
] ]
} }

8
osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
View File

@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
{ {
if (mouseDisabled.Value) if (mouseDisabled.Value)
{ {
mouse.PressedButtons.Remove(MouseButton.Left); mouse.SetPressed(MouseButton.Left, false);
mouse.PressedButtons.Remove(MouseButton.Right); mouse.SetPressed(MouseButton.Right, false);
} }
if (leftViaKeyboard) if (leftViaKeyboard)
mouse.PressedButtons.Add(MouseButton.Left); mouse.SetPressed(MouseButton.Left, true);
if (rightViaKeyboard) if (rightViaKeyboard)
mouse.PressedButtons.Add(MouseButton.Right); mouse.SetPressed(MouseButton.Right, true);
} }
} }
} }

2
osu.Game/Modes/Replays/FramedReplayInputHandler.cs
View File

@ -136,7 +136,7 @@ namespace osu.Game.Modes.Replays
public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list) public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
{ {
Position = position; Position = position;
list.ForEach(b => PressedButtons.Add(b)); list.ForEach(b => SetPressed(b, true));
} }
} }