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

30468 Commits

Author SHA1 Message Date
Dean Herbert
21dc7b57d4
Merge branch 'master' into comments-buttons 2020-07-14 14:06:20 +09: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
Andrei Zavatski
7c71cc6b61 Remove unneeded class from DrawableComment 2020-07-14 03:06:51 +03:00
Andrei Zavatski
56349e65f3 Rename arrow direction method 2020-07-14 03:01:14 +03:00
Andrei Zavatski
f6e4ecd960 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-14 02:46:29 +03: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
Dean Herbert
ef3ab7a858 Merge branch 'master' into fix-carousel-filter-application 2020-07-13 17:05:45 +09:00
Dean Herbert
cd3500510e Fix carousel tests relying on initial selection being null 2020-07-13 17:05:29 +09:00
Dan Balasescu
dfcb73131d
Merge pull request #9517 from vntxx/notification-keybind
Add notifications keybinding
2020-07-13 15:28:58 +09:00
Dan Balasescu
c476bc51ed
Merge pull request #9543 from Joehuu/multi-room-input-when-selected
Only allow link clicking and tooltips of multi room drawables when selected
2020-07-13 15:28:41 +09:00
Dan Balasescu
9ca3692cfd
Merge branch 'master' into notification-keybind 2020-07-13 14:32:23 +09:00
Dan Balasescu
744e695174
Merge pull request #9536 from Joehuu/select-mods-from-score
Add ability to select mods from a specific score in song select
2020-07-13 14:32:14 +09:00
Joehu
79ea6dbd5c Only allow link clicking and tooltips of multi room drawables when selected 2020-07-12 22:24:11 -07:00
Joehu
db6a9c9717 Move null check to menu item addition 2020-07-12 22:06:17 -07:00
Joehu
ac7252e152 Fix context menu not masking outside of leaderboard area 2020-07-12 22:04:00 -07:00
Dean Herbert
0718e9e4b6 Update outdated comment 2020-07-13 13:08:41 +09:00
Dan Balasescu
8c7ff66bfd
Merge pull request #9542 from EVAST9919/rankings-sort-component
Implement RankingsSortTabControl component
2020-07-13 13:03:30 +09:00
Dean Herbert
f442df75a9 Add missing released conditional 2020-07-13 09:00:10 +09:00
Andrei Zavatski
6eec2f9429 Implement RankingsSortTabControl component 2020-07-13 01:22:05 +03:00
Joehu
9c039848bc Simplify and add null check 2020-07-12 12:04:53 -07:00
Dean Herbert
c1aafe83fa Add note about future behaviour 2020-07-12 23:05:47 +09:00
Dean Herbert
08696b9bca Allow pausing gameplay via middle mouse button 2020-07-12 23:03:03 +09:00
Dean Herbert
ab11a112b7 Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load 2020-07-12 22:33:41 +09:00
vntxx
d18609e900 Added notifications keybinding
Implementation of #9502
2020-07-12 12:44:00 +02:00
Andrei Zavatski
0d6dbb6523 Clean up exposed icon for tests 2020-07-12 13:36:42 +03:00
Andrei Zavatski
c9d21894e5 Add test for icon toggle 2020-07-12 13:19:28 +03:00
Andrei Zavatski
be36a4b768 Make ctor protected 2020-07-12 12:39:48 +03:00
Andrei Zavatski
c3524cbe57 Make icon private but expose a protected method 2020-07-12 12:32:26 +03:00
Andrei Zavatski
da40f29b44 Make button text a property 2020-07-12 12:27:26 +03:00
Andrei Zavatski
40aa6c7453 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-12 12:18:10 +03:00
Dean Herbert
57cfdb82ce
Merge pull request #9514 from Joehuu/fix-multi-room-name-overflow 2020-07-12 13:02:20 +09:00
Dean Herbert
a812b8e7fd
Merge pull request #9534 from Joehuu/fix-color/underline-tab-control-checkbox 2020-07-12 12:59:23 +09:00
Joehu
681f001525 Convert icon to local variable 2020-07-11 19:19:34 -07:00
Joehu
4d7dc9f5eb Fix color and underline of tab control checkboxes when initially checked 2020-07-11 18:27:47 -07:00