1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 03:17:28 +08:00
Commit Graph

3483 Commits

Author SHA1 Message Date
smoogipooo
e335b16ee3 Merge remote-tracking branch 'origin/master' into general-fixes 2017-03-31 10:57:45 +09:00
smoogipooo
41aaf42183 Remove DrumRollCirclePiece, cleanup CirclePiece a bit. 2017-03-31 09:57:24 +09:00
Dean Herbert
52ab445f99
Merge branch 'master' into taiko_swell_drawing 2017-03-31 09:08:32 +09:00
Dean Herbert
8e8d1bbd6d Merge branch 'master' into partial-judgements 2017-03-31 09:08:22 +09:00
Dean Herbert
d721f57410 Merge branch 'master' into taiko_replays 2017-03-31 09:08:13 +09:00
Dean Herbert
a4f3816626 Merge branch 'master' into taiko_drumroll_drawing 2017-03-31 09:08:08 +09:00
Dean Herbert
e57de373a8
Add opentk to osu.Desktop's packages. 2017-03-31 09:02:55 +09:00
Dean Herbert
e9a22b9738 Merge pull request #552 from ElegantMonkey/fix-opentk-hint
Fix OpenTK hint on project file
2017-03-31 08:50:03 +09:00
Dean Herbert
6e88e30442 Merge branch 'master' into fix-opentk-hint 2017-03-31 08:44:20 +09:00
Jorolf
0d4f2c59a5 there's probably something in here I overlooked 2017-03-30 17:32:18 +02:00
Jorolf
15326204d5 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-30 16:38:25 +02:00
Dean Herbert
d3f285e455 Merge pull request #575 from smoogipooo/better-transformation-helpers
Fix custom transform.
2017-03-30 22:47:03 +09:00
smoogipooo
76d0beb64f
Fix custom transform. 2017-03-30 22:28:51 +09:00
smoogipooo
f3599b080c Fix using. 2017-03-30 16:12:21 +09:00
smoogipooo
cf4d11c51c Add explicit CentreHit/RimHit classes. 2017-03-30 15:51:16 +09:00
Dan Balasescu
ff325ac330 Merge branch 'master' into taiko_replays 2017-03-30 14:18:51 +09:00
Dan Balasescu
aa1a333a4b Merge branch 'master' into taiko_swell_drawing 2017-03-30 14:16:58 +09:00
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