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

390 Commits

Author SHA1 Message Date
Andrei Zavatski
86c9d5251f Remove unused function 2019-08-12 16:28:53 +03:00
Andrei Zavatski
b71c776e65 Add web-like hover behavior 2019-08-12 16:20:36 +03:00
Andrei Zavatski
62a91e4aaa Add the ability to override Highlighted action to the ModIcon 2019-08-12 15:20:21 +03:00
Andrei Zavatski
21af390327 Move binding to LoadComplete 2019-08-12 14:57:16 +03:00
Andrei Zavatski
0070f6b260 Use CompositeDrawable as a parent class 2019-08-12 14:49:08 +03:00
Andrei Zavatski
9c36cb4af4 Use existing AccentColour logic instead of weird BoxColour 2019-08-12 14:33:30 +03:00
Andrei Zavatski
ba49a4c2da Use existing PageTabControl for layout 2019-08-12 13:16:57 +03:00
Dean Herbert
75cb0d093b Use description correctly
Required for localisation
2019-08-12 16:10:48 +09:00
Andrei Zavatski
87974850dd Initial implementation 2019-08-07 08:42:43 +03:00
Andrei Zavatski
b064df91a7 Initial implementation 2019-08-07 08:33:55 +03:00
Andrei Zavatski
b9384d7a53 Remove unnecessary null check 2019-08-07 07:00:50 +03:00
Andrei Zavatski
24f9872315 Fix unnecessary scores loading 2019-08-07 06:45:39 +03:00
David Zhao
1956098166 Add a fallback for humanizer localization failure 2019-07-30 14:06:08 +09:00
Dean Herbert
cdf75b4098 Public before private 2019-07-22 22:14:09 +09:00
Andrei Zavatski
075ca3d8ea CI fix 2019-07-22 14:47:35 +03:00
Andrei Zavatski
3e95cb9145 Use bindable and disable button 2019-07-22 14:35:18 +03:00
Andrei Zavatski
de8ac9a428 Simple implementation 2019-07-21 21:41:07 +03:00
Dean Herbert
2a94b68ecb Simplify logic 2019-07-20 22:50:17 +09:00
Andrei Zavatski
fa978a47b0 Fix loading animation is no longer present 2019-07-18 15:08:50 +03:00
Joehu
83ffb1d542 Remove unnecessary transforms on top score user section 2019-07-15 14:15:03 -07:00
StanR
1e04fcc6b5 Apply fixes 2019-07-11 17:47:09 +03:00
StanR
cd7c03c13a Add genre and language sections to beatmapset overlay 2019-07-11 16:44:48 +03:00
Dean Herbert
85f2212ebc Reduce spacing and font for rank position 2019-07-11 11:32:42 +09:00
Dean Herbert
8f9b8ed5a1 Simplify information propagation logic 2019-07-11 11:17:33 +09:00
Dean Herbert
cc9ee472d6 Move score nulling out of loading property 2019-07-11 11:07:30 +09:00
Dean Herbert
a49bde7ed3 Move protected below public 2019-07-11 10:38:32 +09:00
Andrei Zavatski
953d32366c Move request inside the ScoresContainer again 2019-07-10 19:40:29 +03:00
Dean Herbert
2285c2b1df
Merge branch 'master' into user-best-score 2019-07-11 00:31:26 +09:00
iiSaLMaN
c3315e805f Use milliseconds for BasicStats' beatmap length 2019-07-10 16:49:32 +03:00
Andrei Zavatski
a0389c338b CI fixes 2019-07-09 17:56:08 +03:00
Andrei Zavatski
9907a58ec4 Revert animations and apply suggested changes 2019-07-09 17:38:17 +03:00
Andrei Zavatski
e8b9b1b0bf visibility logic adjustments 2019-07-09 12:16:58 +03:00
Andrei Zavatski
8d6af1625a Visibility improvements 2019-07-09 11:40:51 +03:00
Andrei Zavatski
8d46d4a28e Fix grade layout 2019-07-09 08:09:31 +03:00
Andrei Zavatski
5d81445454 Move api request outside the scores container 2019-07-09 08:05:34 +03:00
Andrei Zavatski
1e5639acee Add forgotten symbol 2019-07-08 12:10:08 +03:00
Andrei Zavatski
67a6abb96c Add user top score on selected beatmap 2019-07-08 11:49:33 +03:00
iiSaLMaN
90d5484818 Return BPM back to OnlineInfo
Revert commit of "Move BPM out of OnlineInfo"
2019-07-08 09:10:41 +03:00
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
Dean Herbert
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
Dean Herbert
3294464bc6 Fix typo in variable 2019-06-27 12:47:05 +09:00
Dean Herbert
a5ccfeb18e Remove unnecessary fill flow 2019-06-27 12:34:22 +09:00
Dean Herbert
be901294f7 Simplify text layout 2019-06-27 12:33:14 +09:00
Dean Herbert
32c3bee71b Avoid public exposure 2019-06-27 12:11:04 +09:00
Dean Herbert
cc9a7839c9 Fix layout regression 2019-06-27 12:04:01 +09:00
Dean Herbert
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
iiSaLMaN
9ada4d68b1 Make fields protected and expose them in tests 2019-06-26 22:42:34 +03:00
naoey
f3a84de7b5
Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite 2019-06-26 18:17:53 +05:30
Salman Ahmed
eaf6f6891d
Rename to DownloadButtonsContainer 2019-06-26 05:22:08 +03:00
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download 2019-06-26 05:13:58 +03:00
Dean Herbert
ba2f22be47 Improve loading state of BeatmapSet header 2019-06-25 14:47:29 +09:00
HoLLy
739077ef4f Only hide UpdateableAvatar/Flag immediately 2019-06-24 18:24:31 +02:00
HoLLy
aed83471f4 Replace Reset with overridden TransformImmediately/TransformDuration 2019-06-24 10:51:45 +02:00
HoLLy
fafec00667 Reset top score avatar before updating it 2019-06-21 16:47:19 +02:00
iiSaLMaN
0cc7a604ed
Update font sizes 2019-06-21 14:18:20 +03:00
iiSaLMaN
a1c58b164c
Merge branch 'master' into not-available-to-download 2019-06-21 14:16:31 +03:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
KingLuigi4932
13578e5c21 Add the null conditional operator back 2019-06-20 19:43:31 +03:00
KingLuigi4932
d754819453 Small changes 2019-06-20 19:09:40 +03:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Andrei Zavatski
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
KingLuigi4932
5f5441c692 Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays 2019-06-19 20:17:02 +03:00
KingLuigi4932
9f25d3cd72 More changes and improvements 2019-06-19 17:55:36 +03:00
iiSaLMaN
3e285e5dde
Separate beatmap info container from details (avoid overlapping) 2019-06-19 17:47:47 +03:00
iiSaLMaN
15229f3a23
Make header expandable 2019-06-19 17:45:39 +03:00
KingLuigi4932
a6c268ef5c Move the horizontal margin into the sprite text itself 2019-06-19 15:05:53 +03:00
KingLuigi4932
475b40cc02 Remove empty line 2019-06-19 14:47:29 +03:00
KingLuigi4932
4600336581 Use TextFlowContainer + small changes 2019-06-19 14:43:18 +03:00
KingLuigi4932
6e28294182 Fix another test 2019-06-19 04:27:31 +03:00
KingLuigi4932
3876442143 More simplifies + fix test 2019-06-19 03:37:08 +03:00
KingLuigi4932
a0609f28d7 Revert some changes + simplify BeatmapNotAvailable 2019-06-19 01:43:28 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download 2019-06-19 01:14:32 +03:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
KingLuigi4932
155f7c7e03 Use OsuTextFlowContainer for multi-lines 2019-06-13 17:32:27 +03:00
smoogipoo
39f9deea96 Add success rate test scene 2019-06-13 18:44:00 +09:00
smoogipoo
6b615d763a Fix potential nullref 2019-06-13 18:43:51 +09:00
smoogipoo
f2b5f274cf Add details test scene + fix metrics not getting updated correctly 2019-06-13 18:31:39 +09:00
smoogipoo
7af2d650cd Fix potential nullref 2019-06-13 18:31:12 +09:00
smoogipoo
dd7335079f Fix beatmap set overlay not showing ratings 2019-06-13 17:01:57 +09:00
smoogipoo
0a79b444d9 Move metrics to beatmap set 2019-06-13 16:52:49 +09:00
KingLuigi4932
1a50544c94 Add tests for undownloadable / parts-removed beatmapsets 2019-06-12 20:42:52 +03:00
KingLuigi4932
744f32ab35 Fix little bug 2019-06-12 19:11:05 +03:00
naoey
ab27d82cd5
Make beatmap download buttons inherit BeatmapDownloadTrackingComposite
- Move DownloadTrackingComposite into the online namespace
2019-06-11 23:01:01 +05:30
KingLuigi4932
130ff56886 Move logic into BeatmapNotAvailable 2019-06-11 12:29:42 +03:00
iiSaLMaN
ae284d1127
Merge branch 'master' into not-available-to-download 2019-06-10 21:39:32 +03:00
KingLuigi4932
70fdd4ba5b Disable download button + Fix AppVeyor Errors 2019-06-10 21:13:37 +03:00
KingLuigi4932
3202110b80 Add a container for Beatmap Availability 2019-06-10 20:17:44 +03:00
iiSaLMaN
dfbc652803
Use ScoreRank.D instead of F 2019-06-08 19:32:26 +03:00
Dan Balasescu
67ac76aae7
Merge branch 'master' into move-tooltip-text 2019-05-21 15:00:09 +09:00
Dean Herbert
4ac2acbfc0 Fix usages of SpriteText (instead of OsuSpriteText) 2019-05-21 14:13:52 +09:00
Dean Herbert
bc962bf8f0 Move TooltipText to OsuClickableContainer 2019-05-21 13:51:38 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
0603ed9ab7 Fix post-merge errors 2019-04-09 16:27:10 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
smoogipoo
15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
smoogipoo
a6bf076dc7 Adjust green colour 2019-04-04 17:58:34 +09:00
smoogipoo
e13fffaca3 Make ScoreTable use TableContainer 2019-04-04 17:53:23 +09:00
Dean Herbert
84da708d44 Fix nullref 2019-04-03 18:46:08 +09:00
Dean Herbert
cb417ebd77 Player -> User 2019-04-03 18:44:19 +09:00
Dean Herbert
a15a9bd03a Rewrite updateDisplay logic to not fail on some cases 2019-04-03 18:29:46 +09:00
Dean Herbert
5c3c08566f DrawableTopScore can be composite 2019-04-03 18:20:03 +09:00
smoogipoo
3b7d26cca8 Remove custom styled text 2019-04-03 17:49:01 +09:00
smoogipoo
3da008d293 Add a bit of padding between the sections 2019-04-03 16:43:56 +09:00
smoogipoo
f8596e055a Separate into multiple files 2019-04-03 16:38:54 +09:00
smoogipoo
42c915190a Reorder DrawableTopScore 2019-04-03 16:12:24 +09:00
smoogipoo
e246fad301 Clear table if no scores are provided 2019-04-03 16:09:34 +09:00
smoogipoo
2c18b6df1c Fix score table using 300/100/50 2019-04-03 16:09:19 +09:00
smoogipoo
d6b15f040a Improve statistics display 2019-04-03 15:57:36 +09:00
smoogipoo
0cf27e244d Fix usages of SpriteText and obsolete members 2019-04-03 15:44:14 +09:00
smoogipoo
dff58ab4ed Initial cleanup pass of DrawableTopScore 2019-04-03 15:41:33 +09:00
smoogipoo
7f425059ae Adjust transforms 2019-04-03 15:41:22 +09:00
smoogipoo
ab4be3b75f General refactoring 2019-04-03 15:20:38 +09:00
smoogipoo
0d127c21f1 Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design 2019-04-03 14:52:13 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
smoogipoo
2967c876ea Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-29 15:11:00 +09:00
Dean Herbert
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics 2019-03-29 12:42:49 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
smoogipoo
012dcc25c9 Rename APIScoreInfo -> APILegacyScoreInfo 2019-03-27 17:08:40 +09:00
smoogipoo
7239ebf5de Add margin for mods 2019-03-27 13:57:26 +09:00
smoogipoo
adab31fd58 Cleanup + fix up score table layout 2019-03-26 17:38:56 +09:00
smoogipoo
f4aeb390ef Initial re-layout of score table 2019-03-26 10:21:34 +09:00
smoogipoo
f7016e1d2c Rename DrawableScore 2019-03-20 17:15:38 +09:00
smoogipoo
41d25c7d19 Fix post-merge errors 2019-03-20 17:15:21 +09:00
smoogipoo
ce57bdb8db Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-20 17:12:34 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
smoogipoo
315788c975 Rename a few classes 2019-03-11 15:11:01 +09:00
smoogipoo
9a05643ec9 Minor refactorings 2019-03-08 17:18:54 +09:00
smoogipoo
a40ffcc692 Apply formatting adjustments 2019-03-08 16:44:39 +09:00
smoogipoo
30c6a7c3c5 Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
Jamie Taylor
1f273a4c3a
Use local variables where appropriate 2019-02-28 19:58:48 +09:00
Jamie Taylor
b7f7174055
Refactor BeatmapSetOverlay to use chained bindables instead of accessors to distribute changes 2019-02-28 18:46:28 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00