1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:22:59 +08:00
Commit Graph

4673 Commits

Author SHA1 Message Date
Dan Balasescu
634364863d
Merge branch 'master' into beatmap-overlay-header 2020-02-04 13:13:57 +09:00
smoogipoo
bc9b499de0 Make selector only privately-settable 2020-02-04 12:55:09 +09:00
smoogipoo
68b3dc01df Move property override below ctor 2020-02-04 12:53:57 +09:00
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing 2020-02-04 11:57:54 +09:00
Joehu
22e3150f68 Fix comment and remove magic numbers 2020-02-03 17:21:06 -08:00
Andrei Zavatski
5950ba3656 Change the order of colour check 2020-02-04 00:55:41 +03:00
Andrei Zavatski
fe078c244d Expose TabControlOverlayHeader.Current value 2020-02-04 00:43:04 +03:00
Andrei Zavatski
e42b95974a Fix failing test scene 2020-02-03 21:49:21 +03:00
Andrei Zavatski
4abd9cb89a Move Enabled/Disabled state logic to the OverlayRulesetTabItem 2020-02-03 21:45:10 +03:00
Andrei Zavatski
824ee8a888 Recolour rankings tables 2020-02-03 21:22:37 +03:00
Andrei Zavatski
f7cbb8c1f7 Recolour RankingsOverlay background 2020-02-03 21:05:11 +03:00
Andrei Zavatski
2a802307e7 Delete unused components 2020-02-03 20:59:08 +03:00
Andrei Zavatski
3b6ed3fb27 Use new header in the RankingsOverlay 2020-02-03 20:53:30 +03:00
Andrei Zavatski
dc1d0d0f32 Add spotlights selector to new header 2020-02-03 20:47:41 +03:00
Andrei Zavatski
588a77484b Add ContryFilter to new header 2020-02-03 20:32:20 +03:00
Andrei Zavatski
b284170437 Basic implementation of new RankingsOverlayHeader 2020-02-03 20:20:35 +03:00
Andrei Zavatski
12574111e5 Use ColourProvider colours 2020-02-03 19:44:10 +03:00
Andrei Zavatski
e531570352 Merge remote-tracking branch 'refs/remotes/ppy/master' into spotlights_api 2020-02-03 19:34:35 +03:00
recapitalverb
698408bb6d Remove redundant using directive 2020-02-03 22:36:38 +07:00
recapitalverb
4dfdd98e8b Use UserStatistics.DisplayAccuracy everywhere 2020-02-03 22:12:34 +07:00
recapitalverb
9898a926b2 Use ScoreInfo.DisplayAccuracy everywhere 2020-02-03 22:11:36 +07:00
Andrei Zavatski
2abcc6ad69 Simplify counter addition in BeatmapRulesetTabItem 2020-02-03 15:25:07 +03:00
Andrei Zavatski
fa453bc3e1 Refactor beatmap header 2020-02-03 14:35:07 +03:00
Andrei Zavatski
032c2c2afe Refactor BeatmapRulesetSelector 2020-02-03 14:16:26 +03:00
Andrei Zavatski
ce6e97096c Fix broken overlays
oops
2020-02-03 11:44:31 +03:00
Andrei Zavatski
81ab6d43b6 Add ability to create ruleset selector in OverlayHeader 2020-02-03 11:09:46 +03: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
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
Dan Balasescu
c20b14868b
Merge branch 'master' into profile-page-corrections 2020-02-03 13:29:37 +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
98ccfe612b
Merge branch 'master' into no-comments-placeholder 2020-02-03 11:10:06 +09:00
recapitalverb
ff17c76a20 Fix modifiers for performance_background_width 2020-02-03 08:26:12 +07: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
recapitalverb
878489651c Make performance_background_width readonly 2020-02-02 23:04:11 +07: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
aa13b605a4 Fix inconsistent local variable naming 2020-02-02 21:34:35 +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
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
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
Andrei Zavatski
8786d6264f Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-recent-info 2020-02-02 12:03:33 +03:00
Joehu
609ee26030 Fix mod select overlay not showing up in test 2020-02-01 11:41:41 -08:00
Joehu
2d42a83bb9 Fix mod select overlay overflowing toolbar at max ui scale 2020-02-01 11:24:29 -08:00
Dean Herbert
5e834b64cd
Merge branch 'master' into use_ElementAtOrDefault 2020-02-01 10:42:40 +09:00
Berkan Diler
6d30e425a1 Revert change to avoid conflict with another PR 2020-01-31 18:51:29 +01:00
Berkan Diler
9596030e1d Make use of ElementAtOrDefault() when possible 2020-01-31 18:32:47 +01:00
Dean Herbert
c5422743e2
Merge branch 'master' into decouple-mod-select-bindable 2020-02-01 02:06:23 +09:00
Dean Herbert
e728d2be17 Use ElementAtOrDefault 2020-02-01 01:19:04 +09:00
Andrei Zavatski
3b5b799d60 Adjust height of ShowMore button 2020-01-31 09:51:56 +03:00
Andrei Zavatski
4a444face1 Change ShowMoreButton hide logic 2020-01-31 09:46:35 +03:00
Andrei Zavatski
91f7bc6d45 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder 2020-01-31 09:43:23 +03:00
Tree
b03e7f12ff
Remove unused directive 2020-01-30 22:51:35 +01:00
TheWildTree
c050eed79b Recolour RankGraphTooltip 2020-01-30 22:05:06 +01:00
TheWildTree
caf76511a7 Remove double negation 2020-01-30 21:45:42 +01:00
Bartłomiej Dach
1553444001 Fix channel tab keyboard shortcut
Filter out the selector tab item at the point of enumerating tabs to fix
the regression of the Alt+number key shortcut.
2020-01-30 21:44:53 +01:00
TheWildTree
c38dc81535 Remove unnecessary using 2020-01-30 21:39:06 +01:00
TheWildTree
a3877cc29e Recolour RankGraph circle 2020-01-30 20:55:44 +01:00
TheWildTree
3970151e31 Improve condition check 2020-01-30 20:51:33 +01:00
TheWildTree
1751e96840 Recolour ProfileHeaderButton 2020-01-30 19:45:12 +01:00
TheWildTree
e69d93ae5c Adjust ProfileTabControl height 2020-01-30 19:26:42 +01:00
TheWildTree
de9a1737a5 Recolour LevelProgressBar 2020-01-30 18:18:42 +01:00
TheWildTree
754200d843 Fix padding when user has no additional info 2020-01-30 18:10:40 +01:00
TheWildTree
682d0e6e71 Fix typo in variable 2020-01-30 17:46:59 +01:00
Andrei Zavatski
3002366e70 Adjust mode part 2020-01-30 13:56:19 +03:00
Andrei Zavatski
3f62c40e70 Increase spacing 2020-01-30 13:55:50 +03:00
smoogipoo
0c4540b551 Rename PlaylistItem 2020-01-30 19:23:53 +09:00
smoogipoo
00a7adcdca Further refactorings 2020-01-30 19:21:24 +09:00
Andrei Zavatski
a7a3372a98 Remove redundant empty switch section 2020-01-30 13:01:40 +03:00
smoogipoo
f6ba98eec0 Apply refactorings for framework-side changes 2020-01-30 19:00:59 +09:00
Andrei Zavatski
29ba82ee44 Apply different font styles for different content parts 2020-01-30 12:29:35 +03:00
Andrei Zavatski
9fc886abc3 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-recent-info 2020-01-30 12:28:39 +03:00
Dean Herbert
7bf2e9b369 Decouple ModSelectOverlay from global SelectedMods 2020-01-30 17:38:15 +09:00
Andrei Zavatski
2f7076f91c Adjust icons size 2020-01-30 11:16:58 +03:00
Andrei Zavatski
b2c501a439 Adjust font size 2020-01-30 10:54:58 +03:00
Andrei Zavatski
1c4650c02c Merge master with conflicts resolved 2020-01-30 10:39:23 +03:00
Andrei Zavatski
ea2f66da1d Simplify OverlayRulesetTabItem.AccentColour 2020-01-30 10:34:22 +03:00
Andrei Zavatski
10e8361e7c Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-30 10:08:39 +03:00
Andrei Zavatski
a8578c1526 Merge master with conflicts resolved 2020-01-30 10:08:02 +03:00
smoogipoo
2fb640f57f Change to until step + fix CI error 2020-01-30 15:00:39 +09:00
smoogipoo
ce36e5458f Fix possible crash with no channel topic 2020-01-30 14:35:03 +09:00
Dan Balasescu
3d814e7714
Merge branch 'master' into rename-deleted-count 2020-01-30 13:49:54 +09:00
smoogipoo
17978035ea Fix uncaught inconsistent naming 2020-01-30 12:50:15 +09:00
smoogipoo
da2c245083 Change to pink colour scheme 2020-01-30 12:36:47 +09:00
smoogipoo
d7d7ab48d3 Cleanup 2020-01-30 12:36:38 +09:00
Dean Herbert
ebdb425c50 Rename and tidy up DeletedCommentsCounter 2020-01-30 11:17:26 +09:00
Andrei Zavatski
d1ead83c6c Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder 2020-01-30 00:48:43 +03:00
TheWildTree
ef92c26c17 Recolor ProfileSection 2020-01-29 22:26:21 +01:00
TheWildTree
f7c38da030 Match web border height 2020-01-29 22:25:56 +01:00
TheWildTree
87521f35ed Recolor buttons 2020-01-29 22:25:28 +01:00
TheWildTree
06eded16e2 Recolor DetailHeaderContainer 2020-01-29 22:10:58 +01:00
TheWildTree
85990cdcdb Recolor MedalHeaderContainer 2020-01-29 22:10:48 +01:00
TheWildTree
0f9ab7c980 Recolor BottomHeaderContainer 2020-01-29 22:10:19 +01:00
TheWildTree
fa0a96c3f5 Match web margins 2020-01-29 22:05:40 +01:00
TheWildTree
83d5691ba3 Match web border height 2020-01-29 22:00:37 +01:00
TheWildTree
799a86544f Recolor play time border 2020-01-29 21:57:43 +01:00
TheWildTree
088064523b Recolor CentreHeaderContainer 2020-01-29 21:55:41 +01:00
TheWildTree
12a49b74bb Recolor TopHeaderContainer 2020-01-29 21:48:02 +01:00
TheWildTree
c091b31fe8 Recolor basic background boxes 2020-01-29 21:37:51 +01:00
TheWildTree
0ce18256e0 Recolor ProfileTabControl 2020-01-29 21:35:17 +01:00
TheWildTree
65f71b8c12 Make colourProvider accessable from derived classes 2020-01-29 21:23:19 +01:00
Andrei Zavatski
786ed03868 Update profile recent activities in line with the web design 2020-01-29 21:01:40 +03:00
Dean Herbert
7f59576f13
Fix percentage-formatted displays containing a space (#7664)
Fix percentage-formatted displays containing a space
2020-01-29 20:37:32 +09:00
Andrei Zavatski
de6a71ffb7 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-comments-placeholder 2020-01-29 14:06:52 +03:00
smoogipoo
76af8bea5d Fix percentage-formatted displays containing a space 2020-01-29 19:51:24 +09:00
Dan Balasescu
30da9981d6
Merge branch 'master' into profile-scores-update-new 2020-01-29 19:40:44 +09:00
smoogipoo
7f946047f9 Adjust styling to closer match osu-web 2020-01-29 19:25:31 +09:00
smoogipoo
d908bc2693 Remove unnecessary extra spritetext 2020-01-29 18:44:30 +09:00
Andrei Zavatski
5fcda01346 Cleanup pass 2020-01-29 06:58:53 +03:00
Dean Herbert
aa597c1934 Copy documentation across to SettingsSlider 2020-01-29 12:55:07 +09:00
Dean Herbert
f21142ae50 Merge remote-tracking branch 'upstream/master' into slider-tooltip 2020-01-29 12:50:44 +09:00
Andrei Zavatski
dc10e58b4f Add tests for CommentsPage 2020-01-29 06:44:39 +03:00
Andrei Zavatski
e7964023ae Implement CommentsPage class 2020-01-29 06:22:08 +03:00
smoogipoo
ebf15c6a1c General work towards completion + framework updates 2020-01-29 12:17:03 +09:00
Andrei Zavatski
c5e0c77bca Refactor NoCommentsPlaceholder 2020-01-29 06:08:11 +03:00
Andrei Zavatski
b947e89a6b Add placeholder for no comments case in CommentsContainer 2020-01-28 16:53:22 +03:00
unknown
894642d588 add xmldoc and formatting 2020-01-28 18:04:00 +08:00
smoogipoo
2b2cfd91a6 Initial re-implementation using rearrangeable list 2020-01-28 17:59:14 +09:00
Andrei Zavatski
5a2fd18bdd Allow better async support for CommentsContainer 2020-01-28 10:21:27 +03:00
Andrei Zavatski
4e884fc6f4 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-recolour 2020-01-28 10:15:10 +03:00
Dean Herbert
f48c7db827 Use Drawable.Empty instead of container 2020-01-28 15:41:09 +09:00
unknown
aa264cd2a8 allow tooltip to show as percentage as needed 2020-01-28 12:32:30 +08:00
Andrei Zavatski
ce95b4a106 TotalCommentsCounter improvements 2020-01-28 05:57:45 +03:00
Andrei Zavatski
55d78dbc57 CI fix 2020-01-27 16:45:10 +03:00
Andrei Zavatski
e6fa793d56 Refactor background creation in OverlayHeader 2020-01-27 15:36:19 +03:00
Andrei Zavatski
100532845b Recolour CommentsContainer 2020-01-27 15:07:24 +03:00
Andrei Zavatski
68503bf771 Recolour CommentsShowMoreButton 2020-01-27 15:00:56 +03:00
Andrei Zavatski
12ca28ea6d Recolour CommentsHeader 2020-01-27 14:58:27 +03:00
Andrei Zavatski
ed2737e027 Recolour TotalCommentCounter 2020-01-27 14:47:47 +03:00
Andrei Zavatski
79cdfc6dc2 Use OverlayColourProvider 2020-01-27 12:55:19 +03:00
Andrei Zavatski
20268ba45b Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-scores-update-new 2020-01-27 12:37:44 +03:00
Dean Herbert
e37ae589ad
Merge branch 'master' into no-control-overlay-headers 2020-01-27 18:35:33 +09:00
Dean Herbert
292a82ac27 Fix incorrect propagation of stream/build on initial display with build 2020-01-27 14:52:21 +09:00
Dean Herbert
834e82d543 Add comprehensive tests for changelog overlay
Includes failing case
2020-01-27 14:50:41 +09:00
Andrei Zavatski
6463a32f58 Split AccentColour setter in two lines 2020-01-26 17:42:07 +03:00
Andrei Zavatski
e54ea92c60 Use virtual property for OsuTabControl.AccentColour 2020-01-26 17:21:22 +03:00
Andrei Zavatski
7cd60e3193 Make OverlayRulesetSelector use colour provider 2020-01-26 17:07:17 +03:00
Andrei Zavatski
a72250acc6 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-26 16:52:56 +03:00
Andrei Zavatski
891f9a9b18 Remove unused using 2020-01-26 16:49:39 +03:00
Andrei Zavatski
cd0fcfabd9 Merge master with conflicts resolved 2020-01-26 16:35:07 +03:00
Dean Herbert
97c80529d5 Adjust wave colours slightly 2020-01-26 21:47:40 +09:00