sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into replay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
This commit is contained in:
Dean Herbert
2017-03-07 13:50:08 +09:00
parent bc74f453aa 688388333b
commit 4430255ec4
171 changed files with 513 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Modes.Objects.Drawables
public JudgementInfo Judgement;
public abstract JudgementInfo CreateJudgementInfo();
protected abstract JudgementInfo CreateJudgementInfo();
protected abstract void UpdateState(ArmedState state);
@ -82,7 +82,6 @@ namespace osu.Game.Modes.Objects.Drawables
/// <summary>
/// Process a hit of this hitobject. Carries out judgement.
/// </summary>
/// <param name="judgement">Preliminary judgement information provided by the hit source.</param>
/// <returns>Whether a hit was processed.</returns>
protected bool UpdateJudgement(bool userTriggered)
{