1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 15:12:54 +08:00
Commit Graph

29584 Commits

Author SHA1 Message Date
Dean Herbert
11537dd688 Merge branch 'master' into tourney-subscreen-back-button 2020-05-17 17:38:36 +09:00
Dean Herbert
13d4997c91 Remove custom back action logic (use receptor as intended) 2020-05-17 17:35:10 +09:00
Dean Herbert
864c1a73ae Only add back button if required 2020-05-17 17:27:52 +09:00
Dean Herbert
2c0ac8cc36 Move padding to fill, not scroll container 2020-05-17 17:25:26 +09:00
Dan Balasescu
b4ed03fdd4
Merge pull request #9031 from peppy/avoid-host-disable
Avoid disabling a host-level bindable from osu! code
2020-05-17 16:40:06 +09:00
Dan Balasescu
533010f168
Merge branch 'master' into avoid-host-disable 2020-05-17 15:59:39 +09:00
Shivam
d1f39b6b00
Merge branch 'master' into tourney-subscreen-back-button 2020-05-16 12:51:30 +02:00
Shivam
358345cee7 Change logic for parentscreen/subscreen relation 2020-05-16 12:50:56 +02:00
smoogipoo
e3c1112b5a Initial integration into results screen 2020-05-16 19:00:20 +09:00
Dean Herbert
32dd00cb17
Merge branch 'master' into mania-distance-snap-grid 2020-05-16 18:55:48 +09:00
Dean Herbert
9ca4fdf95b
Merge pull request #9042 from smoogipoo/remove-requiredtypes
Remove all RequiredTypes usages
2020-05-16 18:55:12 +09:00
smoogipoo
cfa5a81e78 Cleanup testscene 2020-05-16 18:33:21 +09:00
smoogipoo
8c5ccf574b Add better fix for 1px bleed 2020-05-16 18:33:21 +09:00
Dean Herbert
0279bcf3c8 Fix missed issues 2020-05-16 18:28:22 +09:00
Dean Herbert
be3a0a3c1d Merge branch 'master' into remove-requiredtypes 2020-05-16 18:28:14 +09:00
smoogipoo
16cde20db4 Merge branch 'remove-requiredtypes' into results-screen-condensed-panel 2020-05-16 18:23:39 +09:00
smoogipoo
9b7b1ef605 Add cover urls 2020-05-16 18:23:18 +09:00
smoogipoo
3df92925ee Add score panel test 2020-05-16 18:22:07 +09:00
smoogipoo
2bde4fc3ee Initial implementation of contracted score panel 2020-05-16 18:20:19 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
Shivam
b1243d6a87 Add padding to so the back button is not in the way 2020-05-16 04:05:01 +02:00
Dean Herbert
9d3df14179 Remove unused variable 2020-05-16 11:03:27 +09:00
Shivam
bf6ce390ff Add sub screen implementation to SeedingEditorScreen 2020-05-16 03:07:51 +02:00
Shivam
c931bae70e Add back button to TournamentScreen and the inputhandler for it 2020-05-16 03:07:27 +02:00
Dean Herbert
c47f02c3b7 Update second instance of disabling bindable 2020-05-16 08:24:02 +09:00
Lucas A
ed9d6f2829 Fix CI inspection. 2020-05-15 22:58:15 +02:00
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