smoogipooo
71baf916d1
Fix post-merge errors.
2017-03-30 14:15:42 +09:00
Dan Balasescu
5f0c681feb
Merge branch 'master' into taiko_drumroll_drawing
2017-03-30 14:10:57 +09:00
Dean Herbert
ddc6d45985
Merge pull request #572 from smoogipooo/general-fixes
...
Fix missing base call that may result in invalid ScoreProcessor state.
2017-03-30 14:07:50 +09:00
Dean Herbert
77ac205b62
Merge branch 'master' into partial-judgements
2017-03-30 14:07:43 +09:00
smoogipooo
6287ba321d
Rewrite ScoreProcessor to have a new method for when existing judgements are changed.
...
- OnNewJudgement: Keeps its previous functionality. It is now only invoked when a _new_ judgement has been added to the Judgements hashset.
- OnJudgementChanged: Has a similar funcitonality to OnNewJudgement, but is only invoked whenever a judgement that was _previously_ in the Judgements hashset is changed.
2017-03-30 10:51:14 +09:00
smoogipooo
c2d6faa7c2
Change Judgements into HashSet to prevent duplicates.
2017-03-30 10:39:38 +09:00
Dan Balasescu
1004546327
Merge pull request #573 from peppy/song-select-fixes
...
Song select filter fixes
2017-03-30 09:43:49 +09:00
Jorolf
a3430dd072
add culture info
2017-03-29 16:10:07 +02:00
Jorolf
cdb3150c56
add readonlies and remove unused using directives
2017-03-29 16:00:29 +02:00
Jorolf
866f72e653
fix something the merge broke
2017-03-29 15:51:54 +02:00
Jorolf
6982529481
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-29 15:47:00 +02:00
Jorolf
2f15653d46
removed duplicate code
2017-03-29 15:37:51 +02:00
Jorolf
ab4d1c7725
better maxValue calculation for the retry and fail graph
2017-03-29 15:33:36 +02:00
Jorolf
7bd13d76a8
fixes + updates to DetailsBar and a button for the TestCaseDetails
2017-03-29 14:48:43 +02:00
Dean Herbert
6afa6f30cc
Keep selected beatmap in centre of screen post-filter.
2017-03-29 20:01:46 +09:00
Dean Herbert
a6c8be3637
Increase load delay on panel backgrounds; add back missing fade.
2017-03-29 19:52:16 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter.
2017-03-29 19:48:13 +09:00
smoogipooo
c0dae89844
Implement partial strong hit judgements.
2017-03-29 18:35:38 +09:00
smoogipooo
3050039972
Implement partial judgements + make Result non-nullable.
2017-03-29 18:35:28 +09:00
smoogipooo
bae0ac4901
Fix missing base call that may result in invalid ScoreProcessor state.
2017-03-29 18:21:45 +09:00
smoogipooo
2967000839
Taiko autoplay username :D.
2017-03-29 16:22:08 +09:00
smoogipooo
c5f9c4cac9
Fix possible nullref.
2017-03-29 16:20:54 +09:00
Dean Herbert
e8efdcfe0f
Merge pull request #561 from smoogipooo/taiko_hit_drawing
...
Taiko hit drawing
2017-03-29 16:08:23 +09:00
smoogipooo
1b3e908565
Fix notelocking by pressing a key before the swell's start time.
2017-03-29 16:02:12 +09:00
smoogipooo
3d2c8f19ae
Make Swells require alternating key hits.
2017-03-29 15:59:12 +09:00
smoogipooo
7ba7bc18f8
Don't use a List for HitKeys.
2017-03-29 15:35:22 +09:00
Dan Balasescu
7ee7954f62
Merge branch 'master' into taiko_hit_drawing
2017-03-29 15:22:32 +09:00
smoogipooo
982fcbbf53
Update framework.
2017-03-29 15:20:20 +09:00
smoogipooo
37dcc8b71d
Rewrite how swell circle piece is instantiated.
2017-03-29 14:52:14 +09:00
smoogipooo
400a57ace6
Fix delay + animations a bit (peppy).
2017-03-29 14:50:10 +09:00
smoogipooo
74e12bd95e
Rewrite how drawable-specific circle pieces are instantiated.
2017-03-29 14:01:01 +09:00
Dean Herbert
d64f00cae2
Merge pull request #563 from smoogipooo/general_taiko_fixes
...
General taiko fixes
2017-03-29 13:33:40 +09:00
smoogipooo
59648b99a6
Merge remote-tracking branch 'origin/master' into taiko_swell_drawing
2017-03-29 13:21:41 +09:00
smoogipooo
1c503edad1
Add explicit delay + expire (this will be moved into the base DrawableHitObject later).
2017-03-29 13:19:48 +09:00
smoogipooo
1a56c48ddb
Don't need CentreLeft anchors.
2017-03-29 13:07:43 +09:00
Dan Balasescu
cd799823f0
Merge pull request #569 from peppy/general-fixes
...
General fixes
2017-03-29 12:44:49 +09:00
Dean Herbert
9877a57ba1
Update framework.
2017-03-29 12:38:29 +09:00
Dean Herbert
b96a153e0e
Resize ranks better.
2017-03-29 12:24:04 +09:00
Dean Herbert
d9a4a8d0d4
VisualTests should run at full speed.
2017-03-29 12:23:53 +09:00
smoogipooo
b10f9512ad
Remove unused using.
2017-03-29 11:40:13 +09:00
smoogipooo
a3a0199817
Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing
2017-03-29 11:38:27 +09:00
smoogipooo
eed50784ba
Make player work with TaikoHitRenderer.
2017-03-29 11:35:57 +09:00
smoogipooo
1cfe58e905
Implement convesion from TaikoHitObjects to DrawableTaikoHitObjects.
2017-03-29 11:22:27 +09:00
smoogipooo
6333cd5225
Merge branch 'taiko_replays' into taiko-drawable-generation
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 11:17:55 +09:00
smoogipooo
df88121f34
Fix post-merge errors.
2017-03-29 11:16:14 +09:00
smoogipooo
3c21e6538b
Merge branch 'taiko_drumroll_drawing' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 11:15:10 +09:00
smoogipooo
24c6ee620f
Merge branch 'taiko_hit_drawing' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-03-29 11:12:39 +09:00
smoogipooo
9da28d372a
Merge branch 'taiko_swell_drawing' into taiko-drawable-generation
2017-03-29 11:09:51 +09:00
smoogipooo
475c865968
Implement TaikoModAutoplay.
2017-03-29 11:04:47 +09:00
smoogipooo
589bdde03c
Fix post-merge errors.
2017-03-29 10:59:35 +09:00