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

25841 Commits

Author SHA1 Message Date
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
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
recapitalverb
0a186fe722 Avoid calculating constants in load() 2020-02-02 22:37:58 +07:00
recapitalverb
bd3d7a285b Merge branch 'adjust-profile-scores' of https://github.com/recapitalverb/osu into adjust-profile-scores 2020-02-02 21:39:04 +07:00
recapitalverb
aa13b605a4 Fix inconsistent local variable naming 2020-02-02 21:34:35 +07:00
recapitalverb
2a463e2893
Merge branch 'master' into adjust-profile-scores 2020-02-02 21:14:20 +07:00
recapitalverb
79efcbd6f3 Fix performance background width 2020-02-02 21:08:16 +07:00
Dean Herbert
30a5835bdb Combine link flows and simplify new line addition 2020-02-02 23:07:53 +09:00
recapitalverb
a641069ec2 Change profile score background colour 2020-02-02 21:07:23 +07:00
recapitalverb
122fd63ac4 Inline single-use constants 2020-02-02 21:05:20 +07:00
TheWildTree
35032e2ddd Make variables private 2020-02-02 14:34:06 +01:00
TheWildTree
f7abfdb40e Remove unnecessary parameter 2020-02-02 14:33:48 +01:00
Dean Herbert
aa1daa0ad5
Merge pull request #7703 from bdach/beatmap-stats-precision
Apply precision when determining bar colour in difficulty statistics
2020-02-02 22:31:52 +09:00
Tree
c7e281348a
Merge branch 'master' into profile-page-corrections 2020-02-02 13:36:21 +01:00
recapitalverb
52aae68411
Adjust profile scores to closer match osu-web 2020-02-02 17:52:34 +07:00
TheWildTree
e2589b2dcb Rename drawable 2020-02-02 11:24:28 +01:00
Andrei Zavatski
a70385f2b2 Simplify getRulesetName 2020-02-02 12:19:09 +03:00
Andrei Zavatski
36116f8c45 Refactor ruleset presentation 2020-02-02 12:03:51 +03:00