1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:02:53 +08:00
Commit Graph

28133 Commits

Author SHA1 Message Date
Endrik Tombak
b475316a4e Simplify and comment 2020-04-12 20:40:08 +03:00
Endrik Tombak
63a1686dfb Scroll to screen middle 2020-04-12 12:42:52 +03:00
Dean Herbert
2393ce5f51
Merge pull request #8337 from smoogipoo/add-notelock
Block out-of-order judgements from occurring (aka "note lock")
2020-04-12 00:34:21 +09:00
Dean Herbert
3b6d893dcf
Merge branch 'master' into add-notelock 2020-04-11 23:42:00 +09:00
Dean Herbert
4d0454f2bf
Merge pull request #8712 from peppy/update-framework
Update framework
2020-04-11 17:29:11 +09:00
smoogipoo
a84fe2525b Fix nested hitobjects potentially indirectly masked away 2020-04-11 16:53:45 +09:00
Dean Herbert
eb1fbdacde Remove unintentional edge effect 2020-04-11 15:29:52 +09:00
Dean Herbert
12c21cba7e Add missing masking specification 2020-04-11 15:20:27 +09:00
Dean Herbert
e206df479b Update framework 2020-04-11 15:13:20 +09:00
Dean Herbert
3a36c0008f
Merge pull request #8703 from smoogipoo/fix-editorbeatmap-updates
Fix EditorBeatmap potentially not updating hitobjects
2020-04-10 23:36:12 +09:00
smoogipoo
41caa37856 Add tests 2020-04-10 13:29:49 +09:00
smoogipoo
ee7e2b0854 Fix editor beatmap potentially not updating hitobjects 2020-04-10 13:29:46 +09:00
smoogipoo
6988df30bd Rename variable, add comment 2020-04-10 03:12:13 +09:00
smoogipoo
15a92d1451 Rename test scene 2020-04-10 03:07:44 +09:00
smoogipoo
42b3ff805b Rename methods + fix incorrect method usage 2020-04-10 03:07:44 +09:00
smoogipoo
b54bbc5f6a Improve commenting + refactor 2020-04-10 02:41:48 +09:00
smoogipoo
10e849d196 Separate into separate class 2020-04-10 02:02:09 +09:00
smoogipoo
ea1bec85ae Simplify code/language 2020-04-10 01:41:00 +09:00
smoogipoo
b8d7b78b55 Remove unnecessary null set 2020-04-10 01:21:37 +09:00
smoogipoo
116b952dfe Change param to hitobject rather than result 2020-04-10 01:20:43 +09:00
smoogipoo
a2f5a469cf Merge branch 'master' into add-notelock 2020-04-10 01:18:54 +09:00
Dean Herbert
cc0bcea6e5
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
2020-04-09 21:32:58 +09:00
Dean Herbert
a457880eaa
Merge pull request #8695 from smoogipoo/fix-timeline-crash
Fix crash when trying to edit long beatmaps
2020-04-09 21:05:25 +09:00
smoogipoo
ecd7ce4b98 Fix test scene 2020-04-09 21:00:23 +09:00
Dean Herbert
f961ae862a
Merge pull request #8694 from smoogipoo/fix-encoder-nullref
Fix possible legacy beatmap encoder nullref
2020-04-09 20:44:08 +09:00
smoogipoo
683302a77d Fix crash when trying to edit long beatmaps 2020-04-09 20:25:26 +09:00
smoogipoo
b900f229e7 Fix possible legacy beatmap encoder nullref 2020-04-09 20:21:42 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Dean Herbert
e8f836a410
Merge pull request #8454 from TheWildTree/update-overlay-headers
Update overlay header elements to match osu-web
2020-04-09 17:17:03 +09:00
Dean Herbert
4217484799
Merge pull request #8676 from smoogipoo/mania-stage-background-skinning
Implement mania stage bottom/left/right images
2020-04-09 16:57:12 +09:00
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
Dean Herbert
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00
Dean Herbert
87b29007c2
Merge pull request #8626 from LittleEndu/arrow-easing
Don't allow new transformations for reverse arrow after it's hit
2020-04-08 23:34:02 +09:00
Dean Herbert
9bdc881b3c
Merge pull request #8677 from smoogipoo/fix-minwidth-override
Fix hidden notes due to 0 minimum width
2020-04-08 23:32:25 +09:00
Dean Herbert
825a9bcf42
Merge pull request #8681 from peppy/fix-drum-alignment
Fix osu!taiko input drum alignment for old skin versions
2020-04-08 23:11:33 +09:00
Dean Herbert
61d8cfd224 Fix triangle intro video being out of time 2020-04-08 19:51:55 +09:00
Dean Herbert
d786a2c5b3 Add alignment support for skin versions older than 2.1 2020-04-08 19:42:31 +09:00
Dean Herbert
4b16b2e720 Bump legacy skin version 2020-04-08 19:42:31 +09:00
Dean Herbert
40267cb1fe Add test sprites and make alignment initially better 2020-04-08 19:42:31 +09:00
Dan Balasescu
d0aa791ad4
Merge pull request #8680 from peppy/fix-slider-ball-blending
Fix slider ball and follow circle blending for legacy skins
2020-04-08 19:40:52 +09:00
Dan Balasescu
1c88ac31da
Merge branch 'master' into arrow-easing 2020-04-08 19:04:54 +09:00
Dean Herbert
067ec27859 Also fix slider repeat circles 2020-04-08 18:59:31 +09:00
Dean Herbert
69693ecac7
Merge pull request #8679 from peppy/fix-test-scene-column
Fix TestSceneColumn columns not getting a width
2020-04-08 18:47:02 +09:00
Dean Herbert
f3e909539d Fix slider ball and follow circle blending for legacy skins 2020-04-08 18:39:18 +09:00
smoogipoo
d13231eff7 Use ctor for default width 2020-04-08 18:23:24 +09:00
smoogipoo
7d787dde89 Move comparison to decoder 2020-04-08 18:17:45 +09:00
Dean Herbert
e6b87656ba Fix TestSceneColumn columns not getting a width 2020-04-08 18:04:53 +09:00
smoogipoo
2ddea018cf Fix hidden notes due to 0 minimum width 2020-04-08 17:15:59 +09:00
smoogipoo
83db6cebb6 Implement bottom stage image 2020-04-08 16:20:54 +09:00