1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 20:42:56 +08:00
Commit Graph

26193 Commits

Author SHA1 Message Date
Dan Balasescu
76ba0b833e
Merge pull request #7716 from EVAST9919/overlay-header-ruleset-selector
Add ability to create ruleset selector in OverlayHeader
2020-02-03 19:00:12 +09:00
Dean Herbert
f5a38aff08
Merge pull request #7692 from peppy/safe-screen-lease
Ensure OsuScreen leases are taken out synchronously
2020-02-03 18:57:39 +09:00
Dan Balasescu
c6e7603e5e
Merge branch 'master' into safe-screen-lease 2020-02-03 18:18:13 +09:00
Dan Balasescu
ac6518043f
Merge branch 'master' into overlay-header-ruleset-selector 2020-02-03 17:47:50 +09:00
Dean Herbert
d16711b7fe
Merge pull request #7717 from ppy/dependabot/nuget/Sentry-2.0.1
Bump Sentry from 1.2.0 to 2.0.1
2020-02-03 17:46:33 +09:00
Andrei Zavatski
ce6e97096c Fix broken overlays
oops
2020-02-03 11:44:31 +03:00
Dan Balasescu
0759752bb4
Merge pull request #7714 from peppy/physically-correct-slider-tracking
Make slider tracking match what is on screen
2020-02-03 17:24:08 +09:00
dependabot-preview[bot]
91aa66bcb2
Bump Sentry from 1.2.0 to 2.0.1
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 1.2.0 to 2.0.1.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/1.2.0...2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-03 08:16:18 +00:00
Andrei Zavatski
81ab6d43b6 Add ability to create ruleset selector in OverlayHeader 2020-02-03 11:09:46 +03:00
Dan Balasescu
d7d6e7b36e
Merge branch 'master' into physically-correct-slider-tracking 2020-02-03 16:53:13 +09:00
Dean Herbert
9650a4fb47
Merge pull request #7679 from peppy/present-replay-from-ss
Return to song select after viewing a replay from the leaderboard
2020-02-03 16:51:55 +09:00
Dan Balasescu
098b3ac294
Merge branch 'master' into present-replay-from-ss 2020-02-03 16:28:38 +09:00
Dan Balasescu
1d1a5b26ab
Merge pull request #7678 from peppy/perform-from-screen
Refactor performFromMenu to work with multiple screen targets
2020-02-03 16:28:01 +09:00
Dan Balasescu
93952d438f
Merge pull request #7677 from peppy/decouple-mod-select-bindable
Decouple ModSelectOverlay from global SelectedMods
2020-02-03 16:27:47 +09:00
Dean Herbert
591c7b6250
Merge pull request #7682 from peppy/fix-timeline-tick-overrun
Fix too many ticks being displayed on beatmaps with multiple timing sections
2020-02-03 16:16:23 +09:00
Dean Herbert
9183c78319 Fix crash on exiting song select with ctrl-enter autoplay 2020-02-03 16:04:32 +09:00
Dan Balasescu
7676185bb6
Merge branch 'master' into perform-from-screen 2020-02-03 15:55:45 +09:00
Dean Herbert
8e4df7c214
Merge pull request #7418 from EVAST9919/overlay-ruleset-selector
Implement OverlayRulesetSelector component
2020-02-03 15:33:58 +09:00
Dean Herbert
d9d8712360 Refactor class layout for readability 2020-02-03 15:13:21 +09:00
Dean Herbert
fae5bf0f18
Merge branch 'master' into overlay-ruleset-selector 2020-02-03 13:48:28 +09:00
Dean Herbert
472f9d3ed1
Merge pull request #7686 from TheWildTree/profile-page-corrections
Fix cosmetic issues in UserProfileOverlay
2020-02-03 13:46:07 +09:00
Dan Balasescu
c20b14868b
Merge branch 'master' into profile-page-corrections 2020-02-03 13:29:37 +09:00
Dan Balasescu
a0daf49b6e
Merge pull request #7668 from EVAST9919/profile-recent-info
Update profile recent activities in line with the web design
2020-02-03 13:21:48 +09:00
Dean Herbert
9680c0941f Move private helper methods to botom of file 2020-02-03 12:46:11 +09:00
Dean Herbert
c9143275be
Merge branch 'master' into profile-recent-info 2020-02-03 12:03:00 +09:00
Dean Herbert
84fcf45aae Make slider tracking match what is on screen 2020-02-03 11:55:14 +09:00
Dean Herbert
176be108fe
Merge pull request #7655 from EVAST9919/no-comments-placeholder
Add placeholder for no comments case in CommentsContainer
2020-02-03 11:47:18 +09:00
Dean Herbert
98ccfe612b
Merge branch 'master' into no-comments-placeholder 2020-02-03 11:10:06 +09:00
Dean Herbert
0765748456
Merge pull request #7710 from recapitalverb/adjust-profile-scores
Adjust profile scores to closer match osu-web
2020-02-03 11:02:25 +09:00
Dean Herbert
d320ba416a
Merge pull request #7704 from TheWildTree/fix-follow-circle
Match osu-stable follow circle behaviour and size
2020-02-03 10:58:34 +09:00
Dean Herbert
9426f786e9 Use slightly closer values 2020-02-03 10:33:56 +09:00
Dean Herbert
2253ed4c0d Move path length to a constant 2020-02-03 10:29:40 +09:00
recapitalverb
ff17c76a20 Fix modifiers for performance_background_width 2020-02-03 08:26:12 +07:00
Dean Herbert
edb4c0f752 Add blank lines for conformity 2020-02-03 10:24:53 +09:00
Dean Herbert
cf4788d7ef
Merge branch 'master' into fix-follow-circle 2020-02-03 09:58:12 +09:00
TheWildTree
017ce3d1ec Merge branch 'fix-follow-circle' of https://github.com/TheWildTree/osu into fix-follow-circle 2020-02-02 21:25:44 +01:00
TheWildTree
162a3713a3 Modify tests to avoid fails in CLI testing 2020-02-02 21:25:35 +01:00
Tree
c7f1d4a8a0
Remove unnecessary newline 2020-02-02 19:29:26 +01:00
TheWildTree
fd7fccbb62 Add tests 2020-02-02 19:16:54 +01:00
Bartłomiej Dach
c479d0efa4 Simplify show/hide logic 2020-02-02 17:41:42 +01:00
Bartłomiej Dach
72107c27c9 Only add newline if necessary 2020-02-02 17:39:58 +01:00
TheWildTree
3cc1b811ef Make dates non-italic to match osu-web 2020-02-02 17:22:48 +01:00
TheWildTree
d15942d127 Revert containers merge and rework bottomLinkContainer visibility logic 2020-02-02 17:21:22 +01:00
TheWildTree
030d02594c Allow non-italic DrawableDate 2020-02-02 17:10:11 +01:00
recapitalverb
878489651c Make performance_background_width readonly 2020-02-02 23:04:11 +07:00
TheWildTree
7e162d9798 Fix failing test 2020-02-02 17:03:41 +01:00
TheWildTree
1f53778d62 Add explanation to comment 2020-02-02 16:59:17 +01:00
Salman Ahmed
4cdf4b223c Rename to alwaysShow and add XMLDoc 2020-02-02 18:47:12 +03:00
Salman Ahmed
0f449d1b99 Set config value instead 2020-02-02 18:46:59 +03:00
Salman Ahmed
28e340c486 Inherit Container and fade the key flow instead of individual children 2020-02-02 18:46:27 +03:00