h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 05:32:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into results-screen

Browse Source 
# Conflicts:
#	osu.Game/Rulesets/Replays/Replay.cs
This commit is contained in:
Dean Herbert 2017-04-19 16:25:31 +09:00
commit 662544e04f
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/tasks.json vendored
View File

@ -8,10 +8,7 @@
"taskName": "build", "taskName": "build",
"isShellCommand": true, "isShellCommand": true,
"showOutput": "silent", "showOutput": "silent",
"command": "xbuild", "command": "msbuild",
"windows": {
"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"

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Position = s.Position; Position = s.Position;
//take up full playfield. //take up full playfield.
Size = OsuPlayfield.BASE_SIZE; Size = new Vector2(OsuPlayfield.BASE_SIZE.X);
spinner = s; spinner = s;

2
osu.Game.Rulesets.Osu/OsuAutoReplay.cs
View File

@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Osu
ReplayButtonState button = buttonIndex % 2 == 0 ? ReplayButtonState.Left1 : ReplayButtonState.Right1; ReplayButtonState button = buttonIndex % 2 == 0 ? ReplayButtonState.Left1 : ReplayButtonState.Right1;
double hEndTime = (h as IHasEndTime)?.EndTime ?? h.StartTime; double hEndTime = ((h as IHasEndTime)?.EndTime ?? h.StartTime) + KEY_UP_DELAY;
ReplayFrame newFrame = new ReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button); ReplayFrame newFrame = new ReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button);
ReplayFrame endFrame = new ReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, ReplayButtonState.None); ReplayFrame endFrame = new ReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, ReplayButtonState.None);

4
osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
else else
throw new Exception("Unknown hit object type."); throw new Exception("Unknown hit object type.");
Frames.Add(new ReplayFrame(endTime + 1, 0, 0, ReplayButtonState.None)); Frames.Add(new ReplayFrame(endTime + KEY_UP_DELAY, 0, 0, ReplayButtonState.None));
if (i < beatmap.HitObjects.Count - 1) if (i < beatmap.HitObjects.Count - 1)
{ {
@ -113,4 +113,4 @@ namespace osu.Game.Rulesets.Taiko.Replays
} }
} }
} }
} }

4
osu.Game/Rulesets/Replays/Replay.cs
View File

@ -8,8 +8,10 @@ namespace osu.Game.Rulesets.Replays
{ {
public class Replay public class Replay
{ {
protected const double KEY_UP_DELAY = 50;
public User User; public User User;
public List<ReplayFrame> Frames = new List<ReplayFrame>(); public List<ReplayFrame> Frames = new List<ReplayFrame>();
} }
} }