1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 09:52:55 +08:00
Commit Graph

4847 Commits

Author SHA1 Message Date
Dean Herbert
6a2b3c5c02
Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
Andrei Zavatski
b1b2e4a041 Simplify parent comment assignment 2020-02-13 04:50:04 +03:00
Andrei Zavatski
c391a464a5 Add tests 2020-02-13 04:06:34 +03:00
Andrei Zavatski
483bbac6fd Simplify CommentsPage.onCommentRepliesReceived 2020-02-13 03:13:56 +03:00
Andrei Zavatski
b0db155565 Make replies addition more consistent 2020-02-13 02:47:13 +03:00
Andrei Zavatski
c6f8e157fd Make loadedReplies dictionary private 2020-02-13 02:37:41 +03:00
Andrei Zavatski
5201c1c87b Use new algorithm for comments tree creation 2020-02-13 02:21:13 +03:00
Andrei Zavatski
e2b3494352 Remove dependency on load state for DrawableComment.AddReplies 2020-02-13 00:19:21 +03:00
Andrei Zavatski
ec9c01a75f Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new 2020-02-12 23:32:28 +03:00
Andrei Zavatski
62051c036b Small CommitButton improvements 2020-02-12 13:43:56 +03:00
Andrei Zavatski
ab7adb3a97 Adjust button colours 2020-02-12 13:28:49 +03:00
Andrei Zavatski
760be29015 Merge remote-tracking branch 'refs/remotes/ppy/master' into comment-editor 2020-02-12 13:23:35 +03:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
Andrei Zavatski
9ac6c271ac Naming adjustments 2020-02-12 02:05:45 +03:00
Andrei Zavatski
53a2b65dbd Create dependency between textbox and commit button 2020-02-12 01:35:08 +03:00
Andrei Zavatski
5a3daf1bd7 Implement CommitButton 2020-02-12 00:57:06 +03:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
Andrei Zavatski
c022cf72b5 Implement CancellableCommentEditor 2020-02-11 20:47:51 +03:00
Andrei Zavatski
730c115f49 Fix some size values 2020-02-11 20:11:22 +03:00
Andrei Zavatski
829152c8e8 Implement EditorTextbox 2020-02-11 20:08:24 +03:00
Andrei Zavatski
482f622c94 CommentEditor basic implementation 2020-02-11 18:46:49 +03:00
recapitalverb
2be7d1a873 Remove redundant type specification 2020-02-11 18:19:08 +07:00
recapitalverb
44568ac9e6 Avoid covariant array conversion 2020-02-11 17:36:10 +07:00
recapitalverb
28a39fd8fa Use explicit typing 2020-02-11 17:12:32 +07:00
recapitalverb
17791259ed Fix InfoColumn minWidth implementation 2020-02-11 16:21:31 +07:00
Andrei Zavatski
0b6558dc40 Add SpotlightsLayout to RankingsOverlay 2020-02-11 02:35:23 +03:00
Andrei Zavatski
b04a4b5c8a Implement SpotlightsLayout 2020-02-11 01:44:56 +03:00
Andrei Zavatski
ed6a35cb9f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-11 00:18:11 +03:00
Andrei Zavatski
15b4e3386f Fix incorrect algorithm for comment tree creation
Can cause one comment to be redrawn multiple times
2020-02-10 23:57:48 +03:00
TheWildTree
e072042d4e Match osu-web font size 2020-02-10 21:11:49 +01:00
Bartłomiej Dach
35d5237ddd Adjust font sizes 2020-02-10 20:40:39 +01:00
Bartłomiej Dach
811553cd60 Remove unnecessary coercions
Comparisons to null of nullable numbers are always false.
2020-02-10 20:37:34 +01:00
Bartłomiej Dach
e2950d7027 Extract method to avoid nested ternaries 2020-02-10 20:27:46 +01:00
Andrei Zavatski
d20a860879 CI fix 2020-02-10 16:08:58 +03:00
Andrei Zavatski
8239f21cad Remove whitespace 2020-02-10 15:52:12 +03:00
Andrei Zavatski
26afe0f31e Add ability to load long comment trees in CommentsContainer 2020-02-10 15:43:11 +03:00
Maximilian Junges
ed8cb1d6bf add missing eof newline 2020-02-09 23:46:06 +01:00
Maximilian Junges
3e06324f61 fix formatting issue 2020-02-09 23:39:34 +01:00
Maximilian Junges
867c733809 make score date hoverable 2020-02-09 23:19:32 +01:00
Maximilian Junges
b45f1ef99a make timestamps hoverable 2020-02-09 22:27:37 +01:00
TheWildTree
2770fb71b2 Use SortedStatistics where needed 2020-02-07 21:12:21 +01:00
TheWildTree
7395f01919 Use osu-web font sizes 2020-02-07 20:28:02 +01:00
Andrei Zavatski
881d192af3 Fix crash when selecting spotlight tab with not-null country 2020-02-07 12:07:16 +03:00
Andrei Zavatski
dc8dd24405 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-07 11:49:31 +03:00
TheWildTree
c09af0052b Revert accuracy display and column sorting changes 2020-02-06 20:21:47 +01:00
Andrei Zavatski
5946ad7d80 Fix possible memory leak and better user change test support 2020-02-06 16:54:02 +03:00
Andrei Zavatski
0840033343 Merge remote-tracking branch 'refs/remotes/ppy/master' into logged-out-comments 2020-02-06 16:38:47 +03:00
Dean Herbert
48350638a2 Hide drag handles of all playlist items not currently being dragged 2020-02-06 18:38:00 +09:00
Dean Herbert
0c30e802c0 Merge remote-tracking branch 'upstream/master' into rearrangeable-playlist 2020-02-06 17:40:28 +09:00
Andrei Zavatski
7757a3a30b Move spotlight layout to it's own method 2020-02-05 23:06:13 +03:00
Andrei Zavatski
4dd25b42ae Move spotlightsRequest to another place 2020-02-05 23:00:42 +03:00
Andrei Zavatski
24e8a2bd69 Make SpotlightSelector.ShowInfo use the full rankings response 2020-02-05 22:59:01 +03:00
TheWildTree
c93d2c7f00 Adjust loading container corner radius 2020-02-05 18:26:01 +01:00
TheWildTree
63df6b8da6 Change accuracy formatting method 2020-02-05 17:42:14 +01:00
TheWildTree
fa3934ddb4 Match osu-web button description 2020-02-05 17:16:20 +01:00
TheWildTree
e1e1c1a11a Match osu-web display accuracy
Decided to change this only locally instead of modifying FormatAccuracy which would affect everywhere else in the game as well.
2020-02-05 16:34:39 +01:00
TheWildTree
76037e4ffd Recolour ranked status pill 2020-02-05 16:31:14 +01:00
TheWildTree
f4ee281dd6 Add optional decimal place 2020-02-05 16:15:55 +01:00
Andrei Zavatski
6708e271ac Adjust SpotlightSelector animations 2020-02-05 13:01:50 +03:00
Andrei Zavatski
cb30f463fb Update spotlight info based on selected one 2020-02-05 12:48:29 +03:00
Andrei Zavatski
b83ee6dabf Show beatmap panels for selected spotlight 2020-02-05 12:22:42 +03:00
Andrei Zavatski
2b0b789980 Naming adjustments 2020-02-05 12:14:24 +03:00
Andrei Zavatski
fa65e3a5bb Make spotlight selector work 2020-02-05 12:09:32 +03:00
Andrei Zavatski
a3fd952f74 Use new SpotlightSelector in RankingsHeader 2020-02-05 11:21:23 +03:00
Andrei Zavatski
0bbd95a69c Merge remote-tracking branch 'refs/remotes/ppy/master' into logged-out-comments 2020-02-05 10:57:49 +03:00
Dan Balasescu
af4f3e5fff
Merge branch 'master' into rankings-spotlights-table 2020-02-05 13:42:26 +09:00
Tree
447f31ccfc
Remove using directive 2020-02-04 23:25:21 +01:00
Tree
c2a80119ca
Remove using directives 2020-02-04 23:23:57 +01:00
Tree
23d1d3fdf1
Convert field to local variable 2020-02-04 23:09:10 +01:00
Tree
b606408667
Remove space 2020-02-04 23:02:28 +01:00
TheWildTree
c1b8445b00 Add spacing to match osu-web
Note: due to osu-web using flex to even out the spacing and me not being able to implement the same behaviour here, I added a static margin to separate the title from the diffname above. This looks better than the previous state in most cases, the only scenario where this differs somehow visibly from web is on mapsets with large numbers of difficulties.
2020-02-04 21:53:23 +01:00
TheWildTree
86c0b50983 Adjust font once again for readibility 2020-02-04 21:45:45 +01:00
TheWildTree
d7af96a2e5 Adjust corner radius 2020-02-04 21:42:01 +01:00
TheWildTree
82914b5d6e Adjust ScoreTable spacing 2020-02-04 21:41:33 +01:00
TheWildTree
9795897045 Enforce correct column order in ScoreTable 2020-02-04 21:28:31 +01:00
TheWildTree
d23e4a1fa1 Change scoreboard text size 2020-02-04 21:27:51 +01:00
TheWildTree
5458085849 Adjust TopScoreUserSection font and spacing 2020-02-04 21:11:35 +01:00
TheWildTree
3ef6027d57 Show placeholder instead of success rate when beatmap unranked 2020-02-04 21:02:02 +01:00
TheWildTree
48beb9fd6d Recolour PreviewButton 2020-02-04 21:01:02 +01:00
TheWildTree
88e79dfa78 Hide ratings if beatmap has no leaderboard 2020-02-04 21:00:27 +01:00
TheWildTree
85fb4b4a18 Recolour DetailBox 2020-02-04 21:00:00 +01:00
TheWildTree
cbfb90983b Rename variable 2020-02-04 20:17:27 +01:00
TheWildTree
268bb73ac6 Adjust header padding 2020-02-04 20:14:50 +01:00
TheWildTree
2cc1255035 Adjust online status pill font and padding 2020-02-04 20:09:52 +01:00
TheWildTree
d0eb4e4471 Add necessary variable 2020-02-04 20:08:54 +01:00
TheWildTree
86283cc422 Recolour SuccessRate background 2020-02-04 19:55:19 +01:00
TheWildTree
a366a92d4c Use alpha instead of colour opacity 2020-02-04 19:54:51 +01:00
TheWildTree
b6301f6537 Adjust PreviewButton alpha and animation 2020-02-04 19:52:32 +01:00
TheWildTree
5b881568db Adjust header gradient colours 2020-02-04 19:15:02 +01:00
Andrei Zavatski
a9cfade2f4 Adjust null handling 2020-02-04 21:02:10 +03:00
TheWildTree
5eb1619e24 Adjust title / artist font weight 2020-02-04 18:02:49 +01:00
Bartłomiej Dach
4ea9efd92e Enforce column ordering 2020-02-04 17:59:32 +01:00
Andrei Zavatski
a84068448a refetch comments on user change 2020-02-04 19:19:49 +03:00
Andrei Zavatski
5e369534b6 Allow guests to view comments 2020-02-04 19:15:23 +03:00
TheWildTree
9bc45d21f1 Recolour LeaderboardScopeSelector 2020-02-04 17:11:28 +01:00
recapitalverb
833bb28dcf Adjust separator position between top and bottom content 2020-02-04 22:38:25 +07:00
recapitalverb
0cba1a357f Adjust padding on DrawableTopScore 2020-02-04 21:56:22 +07:00
recapitalverb
bd815cd81b Use minWidth on more columns to further match web 2020-02-04 21:55:48 +07:00
recapitalverb
1c16ab1813 Use better colours 2020-02-04 21:55:20 +07:00
recapitalverb
f112760b00 Revert column separator height to 2 2020-02-04 21:55:04 +07:00
Andrei Zavatski
f889f2435b Add test step to TestSceneRankingsTable 2020-02-04 16:20:15 +03:00
recapitalverb
5030b66092 Adjust width of statistics columns 2020-02-04 19:59:11 +07:00
recapitalverb
a8faee91d8 Use minWidth on pp column 2020-02-04 19:54:57 +07:00
recapitalverb
556a4e64cb Use minimum width on statistics columns 2020-02-04 19:46:14 +07:00
recapitalverb
8f9917238e Add optional minimum width to InfoColumn 2020-02-04 19:45:08 +07:00
recapitalverb
4f312ae6bc Adjust InfoColumn spacing 2020-02-04 19:43:14 +07:00
recapitalverb
c12fc67887 Change InfoColumn title font weight 2020-02-04 19:42:37 +07:00
recapitalverb
3571c2b617 Rearrange children in TopScoreStatisticsSection 2020-02-04 19:41:44 +07:00
Andrei Zavatski
cff619b0e4 Adjust overlay layout 2020-02-04 14:46:22 +03:00
Andrei Zavatski
f30cdab025 Update Scores section 2020-02-04 14:35:04 +03:00
Andrei Zavatski
34091103e3 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-recolour 2020-02-04 14:17:24 +03:00
Andrei Zavatski
0e54e0e092 Recolour DrawableTopScore 2020-02-04 14:17:22 +03:00
Andrei Zavatski
873eda3bb5 Recolour info section 2020-02-04 14:00:18 +03:00
Andrei Zavatski
c3bd6c3f7f Remove no longer used field 2020-02-04 11:21:21 +03:00
Andrei Zavatski
524a8ba6c6 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-update 2020-02-04 11:19:13 +03:00
smoogipoo
b6cfb987f3 Make drag handles not pop into existence 2020-02-04 17:00:36 +09:00
smoogipoo
e4e0a26b62 Merge remote-tracking branch 'origin/master' into rearrangeable-playlist 2020-02-04 16:55:55 +09:00
recapitalverb
42060139f8
Merge branch 'master' into display-accuracy 2020-02-04 12:51:48 +07:00
recapitalverb
7eec8df2f3
Merge branch 'master' into display-accuracy 2020-02-04 12:17:37 +07:00
Dan Balasescu
75f5cb4871
Merge branch 'master' into rankings-overlay-update 2020-02-04 13:52:57 +09:00
Dan Balasescu
2b471be340
Merge branch 'master' into spotlights_api 2020-02-04 13:48:02 +09:00
Dan Balasescu
e45f759c15
Merge pull request #7723 from EVAST9919/overlay-header-current-value
Expose TabControlOverlayHeader.Current value
2020-02-04 13:47:52 +09:00
recapitalverb
79bb476f4c
Merge branch 'master' into display-accuracy 2020-02-04 11:39:47 +07:00
Dan Balasescu
549bdea8a3
Merge branch 'master' into overlay-header-current-value 2020-02-04 13:17:44 +09:00
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