1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 13:22:57 +08:00
Commit Graph

30287 Commits

Author SHA1 Message Date
Lucas A
4096463d02 Move SkipOverlay internal alpha manipulation to a nested container and adjust visual tests. 2020-05-15 19:43:01 +02:00
Fukashi13
6416ace70d fixed indent 2020-05-15 14:31:05 +02:00
Fukashi13
c55eb83351 last section gets selected when scrolling to bottom of list 2020-05-15 14:03:45 +02: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
smoogipoo
6534510999 Use cancellation token in taiko swell/drumroll 2020-05-15 19:25:14 +09:00
smoogipoo
6cd1753459 Add overload to prevent crashes (bosu) 2020-05-15 18:51:44 +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
smoogipoo
4719fcc291 Actually use the cancellation token 2020-05-15 18:17:39 +09:00
smoogipoo
4079642d58 Actually pass in the cancellation token 2020-05-15 18:13: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
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
Dean Herbert
8bbb0c98e0
Merge branch 'master' into migration-ui 2020-05-15 17:39:18 +09:00
Dean Herbert
aec2520ef4 Avoid disabling a host-level bindable from osu! code 2020-05-15 17:31:06 +09:00
smoogipoo
238d87f976 Add comment about gray usage 2020-05-15 15:56:32 +09:00
smoogipoo
1c6c128d11 Add const 2020-05-15 15:51:54 +09:00
smoogipoo
392d44e1fb Always fully display one beat 2020-05-15 15:49:50 +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
smoogipoo
4cbd51feb9 Fix test errors 2020-05-15 13:08:15 +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
Fukashi13
097fcfd9ad
Update osu.Game/Graphics/Containers/SectionsContainer.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-15 00:06:58 +02: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
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