sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix-new-inspections

Browse Source 
# 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
This commit is contained in:
smoogipoo
2019-05-07 13:20:17 +09:00
parent c39c37a18d 5cf7e4603a
commit d7c09e7dbd
372 changed files with 5594 additions and 3030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
Depth = -1,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Icon = FontAwesome.Download,
Icon = FontAwesome.Solid.Download,
Size = new Vector2(16),
Margin = new MarginPadding { Right = 5 },
},

6
osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.HeartOutline,
Icon = FontAwesome.Regular.Heart,
Size = new Vector2(18),
Shadow = false,
},
@ -59,12 +59,12 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
if (favourited.NewValue)
{
pink.FadeIn(200);
icon.Icon = FontAwesome.Heart;
icon.Icon = FontAwesome.Solid.Heart;
}
else
{
pink.FadeOut(200);
icon.Icon = FontAwesome.HeartOutline;
icon.Icon = FontAwesome.Regular.Heart;
}
};