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

30433 Commits

Author SHA1 Message Date
Andrei Zavatski
0043bd74ba Rework SpotlightSelector header layout 2020-07-15 08:27:46 +03:00
Andrei Zavatski
df9ea5cc2f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-spotlights-filter 2020-07-15 08:08:02 +03:00
Dan Balasescu
3ae7104bfe
Merge pull request #9564 from Joehuu/fix-back-button-glow-mod-select
Fix back button not glowing when closing mod select with escape
2020-07-15 14:01:14 +09:00
Dan Balasescu
50c9421c11
Merge pull request #9559 from Joehuu/fix-screens-blocking-home/altf4
Fix certain overlays and screens blocking home and alt-f4
2020-07-15 14:00:54 +09:00
Dan Balasescu
b1c06c1e90
Merge branch 'master' into fix-screens-blocking-home/altf4 2020-07-15 13:17:53 +09:00
smoogipoo
d8ebb8e3eb Move override to a bit better location 2020-07-15 13:17:22 +09:00
smoogipoo
e2c043737d Reword xmldoc to specify intended usage 2020-07-15 13:08:57 +09:00
smoogipoo
350a4a153b Fix possible nullref 2020-07-15 12:59:31 +09:00
Joehu
79f6092344 Fix back button not glowing when closing mod select with escape 2020-07-14 13:31:15 -07:00
Joehu
73e1bf0d89 Check sub screen's OnBackButton instead 2020-07-14 13:19:48 -07:00
Joehu
21ed9df1ea Add xmldoc for OnBackButton 2020-07-14 13:14:59 -07:00
Andrei Zavatski
3d9e174ae8 Make sort changes affect request result 2020-07-14 18:09:09 +03:00
Andrei Zavatski
c2c80d2a98 Refactor SpotlightSelector layout 2020-07-14 17:34:01 +03:00
Dan Balasescu
c49ce65326
Merge pull request #9540 from peppy/gameplay-pause-via-middle-mouse
Allow pausing gameplay via middle mouse button
2020-07-14 21:13:31 +09:00
Dean Herbert
290a07f1e4
Merge pull request #8802 from LittleEndu/always-combo-break
Allow user to always play first combo break sound regardless of lost combo count
2020-07-14 20:41:39 +09:00
Dan Balasescu
b64ddf061e
Remove whitespace 2020-07-14 20:37:21 +09:00
Dan Balasescu
3bae34653e
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 20:31:35 +09:00
Dean Herbert
2626ab41c3 Add implicit braces for clarity 2020-07-14 20:15:31 +09:00
Dean Herbert
956980ee90 Remove setting from gameplay settings screen 2020-07-14 20:12:58 +09:00
Dan Balasescu
f3a498482b
Merge pull request #9553 from peppy/difficulty-adjust-range-match-stabl
Change difficulty adjust mod to match stable range of 0-10
2020-07-14 20:12:28 +09:00
Dean Herbert
c7d3b025ad Rename variable and change default to true 2020-07-14 20:11:54 +09:00
Dean Herbert
690f2fd482 Merge branch 'master' into always-combo-break 2020-07-14 20:11:02 +09:00
Dan Balasescu
0e31982b4e
Merge pull request #9557 from peppy/fix-user-request-population
Fix some web requests retrieving the user too early
2020-07-14 17:56:31 +09:00
Dean Herbert
013eeaf8ed
Merge pull request #9558 from peppy/update-framework
Update framework
2020-07-14 17:55:19 +09:00
Dan Balasescu
f25bd329f7
Merge pull request #9555 from peppy/fix-local-online-lookups-when-logged-out
Fix local online cache database not being used when offline / logged out
2020-07-14 17:51:05 +09:00
Dean Herbert
304e518f7b Update framework 2020-07-14 17:30:20 +09:00
Joehu
36041fc245 Fix back button not working correctly with multi song select's mod select 2020-07-14 00:29:57 -07:00
Dean Herbert
8ace06fcc5 Fix continuations attaching to the BeatmapOnlineLookupQueue scheduler 2020-07-14 16:03:40 +09:00
Joehu
3573460d9c Fix multiplayer screens blocking home and alt f4 2020-07-14 00:02:01 -07:00
Joehu
daa7430fd8 Fix statistics screen blocking retry, home, and alt f4 2020-07-14 00:00:43 -07:00
Joehu
4caf4d31d4 Fix mod select blocking home and alt f4 in song select 2020-07-14 00:00:10 -07:00
Joehu
1a2f5cb477 Add OnBackButton bool to OsuScreen 2020-07-13 23:59:20 -07:00
Dean Herbert
7fe69bb199 Fix some web requests retrieving the user too early 2020-07-14 13:07:17 +09:00
Dean Herbert
e35e9df4e1 Fix local online cache database not being used when offline / logged out 2020-07-14 12:02:03 +09:00
Dean Herbert
e0d9e70404
Merge pull request #9426 from MiraiSubject/legacy-background 2020-07-14 11:38:16 +09:00
Dean Herbert
8a77a3621e Update resources 2020-07-14 11:03:55 +09:00
Dean Herbert
42dfc47fe3 Merge branch 'master' into legacy-background 2020-07-14 11:03:47 +09:00
Dean Herbert
f36c23928b Merge branch 'master' into legacy-background 2020-07-14 11:02:24 +09:00
Dean Herbert
b59e4f8a7e Change difficulty adjust mod to match stable range of 0-10 2020-07-14 08:15:14 +09:00
Dean Herbert
064814f70a
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 07:39:02 +09:00
Dean Herbert
8411a36a0f
Merge pull request #9545 from smoogipoo/reset-judgement-animation 2020-07-14 07:35:53 +09:00
Dean Herbert
38e9b882b8 Update framework 2020-07-14 07:04:30 +09:00
Dean Herbert
407da5c450
Merge pull request #9551 from ppy/dependabot/nuget/NUnit3TestAdapter-3.17.0
Bump NUnit3TestAdapter from 3.15.1 to 3.17.0
2020-07-14 06:13:36 +09:00
dependabot-preview[bot]
8087a75c35
Bump NUnit3TestAdapter from 3.15.1 to 3.17.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.17.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-13 17:22:39 +00:00
Dan Balasescu
c13064efc4
Merge pull request #9539 from peppy/fix-carousel-filter-application
Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load
2020-07-13 21:25:43 +09:00
smoogipoo
53520ec7c4 Add test 2020-07-13 21:21:59 +09:00
smoogipoo
8a3cadc111 Fix judgement animations not resetting on use 2020-07-13 21:21:59 +09:00
Dan Balasescu
69548447a7
Adjust step name 2020-07-13 20:03:07 +09:00
Dan Balasescu
dd9211d6f0
Merge pull request #9544 from peppy/call-schedule-protected-next
Fix potential crash when trying to ensure music is playing
2020-07-13 18:03:40 +09:00
Dean Herbert
7b7b92aa10 Fix potential crash when trying to ensure music is playing 2020-07-13 17:28:16 +09:00