1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 14:33:21 +08:00
Commit Graph

29780 Commits

Author SHA1 Message Date
Dean Herbert
75b0ada087 Merge branch 'master' into migration-ui 2020-05-14 21:40:38 +09:00
Dean Herbert
155e918ca3 Remove unused parameter 2020-05-14 21:40:28 +09:00
Fukashi13
e390d70b70 bestMatch changes on entering section with screen top border 2020-05-14 14:33:12 +02:00
Dean Herbert
42f446faa9 Fix remaining test failure 2020-05-14 21:10:04 +09:00
Dean Herbert
11b780c97f Merge branch 'migration-ui' of https://github.com/peppy/osu into migration-ui 2020-05-14 20:19:14 +09:00
Dean Herbert
f3b1c32a85 Update test logic for new exception type 2020-05-14 20:18:57 +09:00
Dan Balasescu
fe7c5bbc8b
Merge branch 'master' into fix-failure-logic 2020-05-14 20:16:37 +09:00
smoogipoo
3441ab457d Fix hitobjects placed at non-beatsnapped times 2020-05-14 20:06:34 +09:00
Dan Balasescu
9d557bf806
Merge pull request #9005 from peppy/reposition-taiko-playfield
Reposition taiko playfield closer to top of screen
2020-05-14 20:01:07 +09:00
smoogipoo
0e33494074 Fix flashing when changing beat divisor 2020-05-14 19:58:39 +09:00
smoogipoo
42c3d892cd Only update alive lines 2020-05-14 19:55:14 +09:00
smoogipoo
91d1b15d5a Integrate grid with the mania composer 2020-05-14 19:55:07 +09:00
Dean Herbert
29b3b4d25b
Merge branch 'master' into migration-ui 2020-05-14 19:48:44 +09:00
Dan Balasescu
f761c5e119
Merge branch 'master' into reposition-taiko-playfield 2020-05-14 19:37:05 +09:00
smoogipoo
16585f767e Add initial beat snap grid implementation 2020-05-14 19:17:24 +09:00
Dean Herbert
a582611647 Add test coverage 2020-05-14 19:05:35 +09:00
smoogipoo
0ef3bae26a Expose playfield from IManiaHitObjectComposer 2020-05-14 18:34:51 +09:00
Dan Balasescu
0faafac5a2
Merge pull request #9003 from peppy/fix-taiko-scroller-time-control
Fix taiko scroller not correctly adhering to gameplay time movement
2020-05-14 17:56:07 +09:00
Dean Herbert
4e4a779d68 Improve overall UI 2020-05-14 17:41:55 +09:00
Dean Herbert
d04079f6ab Fix directory selector not masking properly 2020-05-14 17:41:55 +09:00
Dean Herbert
06f507496a Delete migration source if no files exist after completion 2020-05-14 17:41:55 +09:00
Dean Herbert
0b73063a89 Add basic (working) migration UI 2020-05-14 17:41:55 +09:00
Dean Herbert
cb0b25ac55 Throw better exceptions from OsuStorage 2020-05-14 17:41:55 +09:00
Dean Herbert
6bb06e9d61 Expose CurrentDirectory bindable for consumption 2020-05-14 17:41:55 +09:00
Dan Balasescu
75777d22d2
Merge pull request #8999 from namaenonaimumei/pr-beatmap_listing_pagination
BeatmapListingOverlay auto-pagination reimplementation
2020-05-14 17:36:04 +09:00
smoogipoo
4bf5477252 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-14 17:04:09 +09:00
Dan Balasescu
0e15bb5ca5
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-14 16:36:07 +09:00
Dan Balasescu
35623e8513
Merge pull request #9011 from peppy/directory-chooser
Add a basic directory chooser component
2020-05-14 16:13:48 +09:00
Dean Herbert
90d2068657
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-14 16:02:28 +09:00
Dean Herbert
facde2c8e1 Remove unnecessary generic specification on cursor 2020-05-14 16:01:07 +09:00
Dean Herbert
c836c9319b Combine pagination logic into BeatmapListingFilterControl 2020-05-14 15:35:11 +09:00
Dan Balasescu
39f8f7ed78
Merge branch 'master' into directory-chooser 2020-05-14 15:23:52 +09:00
Dan Balasescu
99b90b9b72
Merge pull request #8622 from iiSaLMaN/catch-legacy-skin-decoding
Add test for osu!catch skin configuration colour decoding
2020-05-14 15:16:13 +09:00
Dean Herbert
04c9973526 Clean up cancellation logic 2020-05-14 14:33:31 +09:00
Dean Herbert
fa3373e5f3 Reorder file and change naming slightly 2020-05-14 14:24:43 +09:00
Dean Herbert
5e09a1b334 Use Action rather than custom handler 2020-05-14 14:23:12 +09:00
Dean Herbert
ac8c230187
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-14 13:35:57 +09:00
Salman Ahmed
ff6642190f
Update colour retrieval logic 2020-05-14 07:26:47 +03:00
Salman Ahmed
b161aa72b7
Merge remote-tracking branch 'upstream/master' into catch-legacy-skin-decoding 2020-05-14 07:22:01 +03:00
Dean Herbert
149cb93e8c Add very basic error handling when a directory cannot be enumerated 2020-05-14 13:18:37 +09:00
Dean Herbert
4198f4d96e
Merge pull request #8448 from iiSaLMaN/catch-hyperdash-catcher-colouring
Add support for custom hyper-dash catcher colouring
2020-05-14 13:06:57 +09:00
Dean Herbert
7084b748c3
Merge branch 'master' into catch-hyperdash-catcher-colouring 2020-05-14 10:42:49 +09:00
Dean Herbert
c85ebbc8a2
Merge pull request #8857 from Craftplacer/taiko-don
Add taiko mascot display for legacy skins
2020-05-14 10:41:59 +09:00
Dean Herbert
134a94e86d Rename enum members (no idea what a TaikoDon is) 2020-05-14 10:02:47 +09:00
Dean Herbert
76af6f25f1 Remove pointless test resources 2020-05-14 09:58:58 +09:00
Dean Herbert
9ba1a8af88 Fix mascot getting stuck in clear state on rewind 2020-05-14 09:44:21 +09:00
namaenonaimumei
9e71b3c4df
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-14 02:23:46 +09:00
「空白」
43450b5485 Resolve remaining InspectCode issues
> CI should now pass build test
2020-05-14 01:57:03 +09:00
Bartłomiej Dach
0933217389 Simplify mascot scaling 2020-05-13 18:53:47 +02:00
Bartłomiej Dach
8e023f7c48 Merge branch 'master' into taiko-don 2020-05-13 18:38:19 +02:00