From 8bfcfbc276233220b1a97b04982f22ded3e20c4d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 8 Jan 2017 20:51:57 +0800 Subject: [PATCH 1/3] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 4ce11f434d..b84b391c7f 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4ce11f434dccb07b35b64618bf3db97c09d310a5 +Subproject commit b84b391c7fed14023ad309f42169909f4151d69b From 8ba5c1c15de7636b8bcd95069c1215f1fb30c3f4 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 8 Jan 2017 20:52:19 +0800 Subject: [PATCH 2/3] Fix not being able to hit two stacked circles by pressing both buttons/keys on the same frame. --- osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs index b2179d95d0..5143bd4af8 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -42,6 +42,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables Colour = osuObject.Colour, Hit = () => { + if (Judgement.Result.HasValue) return false; + ((PositionalJudgementInfo)Judgement).PositionOffset = Vector2.Zero; //todo: set to correct value UpdateJudgement(true); return true; From 651ea1b0d672f0ec93f4feea8e95529f0b089475 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 8 Jan 2017 21:01:48 +0800 Subject: [PATCH 3/3] Update resources. --- osu-resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-resources b/osu-resources index e24414a277..30031c02af 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit e24414a277e407ae2438e4b6d9fa9c7992dd6485 +Subproject commit 30031c02aff374f0c5558f2d732614559301f658