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

30327 Commits

Author SHA1 Message Date
Dan Balasescu
be2c892c30
Merge branch 'master' into ensure-music-playing-mainmenu-lounge 2020-07-10 20:48:16 +09:00
Dean Herbert
b59183df54
Merge pull request #9493 from peppy/highlight-spotlight-rooms 2020-07-10 20:44:15 +09:00
Dean Herbert
285da83f1b
Merge pull request #9491 from smoogipoo/multiplayer-categories 2020-07-10 20:43:59 +09:00
smoogipoo
fe585611e7 Fix + simplify web request 2020-07-10 19:54:09 +09:00
Dean Herbert
64e8dce1ad Highlight spotlight rooms with a different colour 2020-07-10 19:38:33 +09:00
Dean Herbert
cf3251a950 Default to showing all rooms 2020-07-10 19:38:13 +09:00
Dean Herbert
24132c7cf9 Merge branch 'master' into multiplayer-categories 2020-07-10 19:00:57 +09:00
Dean Herbert
63f42c5502
Merge pull request #9216 from frenzibyte/add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 18:44:36 +09:00
Dean Herbert
f699a34c77 Rename variable for potential future expansion 2020-07-10 18:19:18 +09:00
Dean Herbert
4a1621bf98 Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 18:17:18 +09:00
Dean Herbert
cb56b8e031 Add test for menu playing music on return 2020-07-10 18:13:58 +09:00
Dean Herbert
1760cc2427 Fix behavioural regression by splitting methods out 2020-07-10 18:03:56 +09:00
Dan Balasescu
a0268b4d3d
Merge pull request #9488 from peppy/osu-cursor-visibility
Make default skin cursor more visible against bright backgrounds
2020-07-10 18:03:07 +09:00
Dean Herbert
5837051bb4
Merge pull request #9448 from peppy/un-nest-overlined-display 2020-07-10 17:41:02 +09:00
smoogipoo
926279e39b Implement category dropdown for multiplayer 2020-07-10 17:26:42 +09:00
smoogipoo
ed926de77f Fix up/improve dropdown styling/positioning 2020-07-10 17:25:28 +09:00
smoogipoo
d0c2a1b9d3 Move dropdown out of display style selector 2020-07-10 17:25:07 +09:00
Dean Herbert
44fdb5b82e Ensure music starts when returning to lounge or main menu 2020-07-10 17:20:27 +09:00
Dean Herbert
49b88971d1 Display all usable beatmaps in playlist, including protected 2020-07-10 17:20:27 +09:00
Dean Herbert
632f333ce2 Add ability to return protected beatmaps in GetAllUsable call 2020-07-10 17:20:27 +09:00
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
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