1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Commit Graph

29181 Commits

Author SHA1 Message Date
Dean Herbert
be3a0a3c1d Merge branch 'master' into remove-requiredtypes 2020-05-16 18:28:14 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
Dan Balasescu
43c42cdf31
Merge pull request #9036 from peppy/fix-audio-offsets-rate-adjust
Fix applied platform/user offsets being incorrect when rate adjust mods are active
2020-05-15 19:33:28 +09:00
Dean Herbert
9b6525bb03 Fix applied platform/user offsets being incorrect when rate adjust mods are active 2020-05-15 18:44:47 +09:00
Dan Balasescu
e33c177018
Merge pull request #9020 from peppy/migration-ui
Add ability to change data folder path
2020-05-15 18:08:52 +09:00
Dean Herbert
8bbb0c98e0
Merge branch 'master' into migration-ui 2020-05-15 17:39:18 +09:00
Dan Balasescu
edda98b417
Merge pull request #9027 from peppy/fix-nested-folder-migration-endless-copy
Add more safeties to storage migration
2020-05-15 14:36:55 +09:00
Dan Balasescu
e3025ede6b
Merge branch 'master' into fix-nested-folder-migration-endless-copy 2020-05-15 13:43:47 +09:00
Dean Herbert
6ca102bc3f Attempt delete operations more than once 2020-05-15 13:19:03 +09:00
Dean Herbert
9ed0e8891b Merge branch 'fix-nested-folder-migration-endless-copy' into migration-ui 2020-05-15 13:04:16 +09:00
Dean Herbert
aea192080a Fix incorrect storage name 2020-05-15 13:02:46 +09:00
Dan Balasescu
8872eace3d
Merge pull request #9029 from peppy/fix-mute-button-ui-scaling
Fix mute button falling off the screen when UI scaling is used
2020-05-15 13:00:44 +09:00
Dean Herbert
94cf99bf97 Fix mute button falling off the screen when UI scaling is used 2020-05-15 12:22:59 +09:00
Dean Herbert
fd2f2dbd42
Merge pull request #9024 from MiraiSubject/small-tourney-updates
Use unique video in map pool scene of tournament client
2020-05-15 11:36:44 +09:00
Dean Herbert
7641507c90 Ensure test directories are deleted before subsequent run 2020-05-15 10:45:57 +09:00
Dean Herbert
0690d81bbb Add protection against migrating to a nested folder 2020-05-15 10:40:26 +09:00
Dean Herbert
19f117ae53 Update test logic for new exception type 2020-05-15 10:28:03 +09:00
Dean Herbert
25bbb02999 Throw better exceptions from OsuStorage 2020-05-15 10:28:03 +09:00
Shivam
1768beb690 Rename class SeeingEditorScreen to SeedingEditorScreen 2020-05-14 21:52:10 +02:00
Shivam
6ec55eb400 Give mappool scene its own video 2020-05-14 21:51:39 +02:00
Dan Balasescu
4b0ca87a0a
Merge pull request #9007 from peppy/fix-failure-logic
Fix mod failure checks executing actual game logic
2020-05-14 23:06:34 +09:00
Dean Herbert
364aa5aa12 Add protection against migrating to a nested folder 2020-05-14 22:45:03 +09:00
Dean Herbert
827d75b152 Revert "Add protection against migrating to a nested folder"
This reverts commit ef8375b442.
2020-05-14 22:44:27 +09:00
Dean Herbert
ef8375b442 Add protection against migrating to a nested folder 2020-05-14 22:42:42 +09:00
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
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
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
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
Dean Herbert
a582611647 Add test coverage 2020-05-14 19:05:35 +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