1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 14:40:04 +08:00
Commit Graph

30370 Commits

Author SHA1 Message Date
Dean Herbert
1b9f09f9c2
Merge branch 'master' into osu-cursor-visibility 2020-07-10 17:15:34 +09:00
Dean Herbert
59c7ac32b5
Merge branch 'master' into un-nest-overlined-display 2020-07-10 17:15:24 +09:00
Dean Herbert
3138cc455c
Merge branch 'master' into judgement-pooling 2020-07-10 17:15:19 +09:00
Dean Herbert
664ab6d5f6
Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 17:14:46 +09:00
Dean Herbert
e79c2871e9
Merge pull request #9490 from peppy/update-framework
Update framework
2020-07-10 17:14:26 +09:00
Dean Herbert
bc6f2199f3 Update framework 2020-07-10 16:49:11 +09:00
Dan Balasescu
9d2c7afed0
Merge pull request #9489 from peppy/add-ruleset-dynamic-compilation-exclude-rules
Add dynamic compilation exclusion rules for ruleset types
2020-07-10 15:44:01 +09:00
smoogipoo
1f2689f7cb Merge branch 'master' into un-nest-overlined-display 2020-07-10 15:37:43 +09:00
smoogipoo
2ed8d42d22 Remove whitespace 2020-07-10 15:37:13 +09:00
smoogipoo
a9faa11dcb Add back playlist header 2020-07-10 15:37:08 +09:00
Dean Herbert
f0dd463416
Merge pull request #9478 from peppy/lounge-keyboard-selection 2020-07-10 15:16:20 +09:00
Dean Herbert
bd5957bc0a Add dynamic compilation exclusion rules for ruleset types 2020-07-10 14:49:44 +09:00
Dean Herbert
b68a2d885c Add testability against different background colours / with user input 2020-07-10 14:47:26 +09:00
Dean Herbert
fee19753e1 Fix animations not playing correctly in test scene due to too many calls to OnPressed 2020-07-10 14:47:11 +09:00
Dean Herbert
13618915b7 Don't show cursor guide in gameplay cursor test 2020-07-10 14:46:49 +09:00
Dean Herbert
c562435267 Adjust cursor transforms for better feel 2020-07-10 14:44:30 +09:00
Dean Herbert
a21c2422c5 Make cursor centre portion non-expanding and more visible with outline 2020-07-10 14:44:20 +09:00
Dean Herbert
e211ba5e7d Fix cursor scale potentially not being updated if set too early 2020-07-10 14:43:30 +09:00
Dan Balasescu
14eaf75009
Merge branch 'master' into un-nest-overlined-display 2020-07-10 14:41:31 +09:00
Dan Balasescu
b02777f9f6
Merge branch 'master' into lounge-keyboard-selection 2020-07-10 14:36:40 +09:00
Dan Balasescu
ffbb70d827
Merge pull request #9471 from peppy/fix-custom-data-directory-tests
Ensure directories are deleted before migration tests run
2020-07-10 14:36:29 +09:00
Dan Balasescu
8ddec0703f
Merge branch 'master' into fix-custom-data-directory-tests 2020-07-10 13:58:18 +09:00
smoogipoo
1bcd673a55 Fix crash when switching rooms quickly 2020-07-10 12:09:34 +09:00
Dan Balasescu
e6a759334d
Merge pull request #9476 from peppy/lounge-scroll-selected-into-view
Scroll selected room into view on selection
2020-07-10 10:45:16 +09:00
Dan Balasescu
84a047ad9d
Merge pull request #9477 from peppy/multiplayer-test-simplify
Change multiplayer tests to have null room by default
2020-07-10 10:27:42 +09:00
smoogipoo
4c24388fc0 Apply review fixes 2020-07-10 10:16:44 +09:00
Dan Balasescu
58de7a2e74
Merge branch 'master' into multiplayer-test-simplify 2020-07-10 09:58:58 +09:00
Dean Herbert
bd60756d9e
Merge branch 'master' into fix-custom-data-directory-tests 2020-07-09 18:58:02 +09:00
Dean Herbert
43624381bf Change multiplayer tests to have null room by default 2020-07-09 18:55:53 +09:00
Dean Herbert
0bc5452801 Add test coverage 2020-07-09 18:55:18 +09:00
Dean Herbert
25ddc5784d Change multiplayer tests to have null room by default 2020-07-09 18:55:10 +09:00
Dean Herbert
973b6c680a
Merge branch 'master' into un-nest-overlined-display 2020-07-09 18:26:23 +09:00
Dan Balasescu
0f91e41764
Merge pull request #9475 from peppy/lounge-remove-search-container
Remove unused search container in lounge
2020-07-09 18:25:43 +09:00
Dean Herbert
115bb40816 Select via select action 2020-07-09 18:25:14 +09:00
Dean Herbert
601101147e Allow keyboard selection of rooms at the multiplayer lounge 2020-07-09 18:25:14 +09:00
Dean Herbert
95096cbf5e Use better screen load logic 2020-07-09 18:25:07 +09:00
Dean Herbert
1ded94e5be Add test coverage 2020-07-09 18:07:34 +09:00
Dean Herbert
80f6f87e01 Scroll selected room into view on selection 2020-07-09 17:45:29 +09:00
Dean Herbert
69062a3ed1 Remove unused search container in lounge 2020-07-09 17:43:26 +09:00
Dan Balasescu
7720f928c8
Merge pull request #9464 from bdach/spinner-rotation-but-not-boneheaded
Fix spinner spinning in the wrong direction
2020-07-09 16:56:46 +09:00
Dan Balasescu
7ff93c0856
Merge branch 'master' into spinner-rotation-but-not-boneheaded 2020-07-09 16:31:14 +09:00
Dean Herbert
2dc1f90149
Merge pull request #9447 from peppy/opaque-toolbar 2020-07-09 16:30:08 +09:00
Dean Herbert
f5e79d1bf3
Merge branch 'master' into opaque-toolbar 2020-07-09 16:04:50 +09:00
Dean Herbert
1f2a2f0e4f
Merge pull request #9474 from smoogipoo/update-framework 2020-07-09 16:04:23 +09:00
smoogipoo
7d59825851 Update framework 2020-07-09 15:16:40 +09:00
Dean Herbert
fce9eaaff9
Merge pull request #9470 from smoogipoo/dispose-task-scheduler 2020-07-09 15:14:27 +09:00
Dean Herbert
3a5784c410 Ensure directories are deleted before migration tests run 2020-07-09 15:08:15 +09:00
Dan Balasescu
fcf3d1ca89
Merge branch 'master' into opaque-toolbar 2020-07-09 15:00:17 +09:00
Dan Balasescu
280d9f3532
Merge pull request #9469 from peppy/song-select-filter-control
Clean up song select filter control UI
2020-07-09 14:59:47 +09:00
smoogipoo
04ce436f6a Dispose beatmap lookup task scheduler 2020-07-09 14:46:58 +09:00