RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,572 Commits 3 Branches 650 Tags 352 MiB
Commit Graph

398 Commits

Author SHA1 Message Date
Dean Herbert bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert 00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Arphox 07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
Dean Herbert 609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert 60b70c0f45 Use lambda for simple functions 2019-06-07 14:11:21 +09:00
Dean Herbert 64d5aa318f Apply rebased changes 2019-06-07 11:45:58 +09:00
Dean Herbert 2538f32fae Merge branch 'osu-clickable-container' into OsuHoverContainer 2019-06-05 10:34:20 +09:00
Arphox 900cd5c484 Restore original values in FadeColour method call 2019-06-04 21:37:10 +02:00
Arphox 5f4d7437bc Fix the issue 
When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.
 2019-06-04 21:30:49 +02:00
Dean Herbert 80a66b8b3a Merge remote-tracking branch 'upstream/master' into audio-refactor-update 2019-06-04 12:08:21 +09:00
Dean Herbert 3ef17a54f6 Fix sizing of OsuAnimatedButton and OsuClickableContainer 
Was incorrect under some combinations of relative and autosize usage.
 2019-06-03 13:53:24 +09:00
EVAST9919 fe9e53e383 Add a testcase 2019-05-30 23:07:04 +03:00
Dean Herbert 4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dan Balasescu 2024cdf16d
Merge branch 'master' into hover-container-disabled-hover-effect 2019-05-21 17:04:50 +09:00
Dean Herbert 5ed1540a12 Handle unhover state change better 2019-05-21 15:02:31 +09:00
Dean Herbert 89e62c3d30 Only play OsuHoverContainer hover effect if action is present 2019-05-21 14:07:40 +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
Dean Herbert fa340a9eff
Merge branch 'master' into profile-header-update 2019-04-27 23:48:23 +09:00
Dean Herbert d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo 3b0d4c1bad Merge branch 'turn-on-warnings' into profile-header-update 2019-04-25 17:43:10 +09:00
smoogipoo 0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
smoogipoo 4106da2430 Rename facade + cleanup usage 2019-04-17 17:05:33 +09:00
smoogipoo 3a1587fa53 Throw exception when not relatively positioned 2019-04-17 17:04:11 +09:00
smoogipoo 9f92b3a8ba Add xmldoc 2019-04-17 16:34:53 +09:00
jorolf c1db635933 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-09 20:42:39 +02: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
David Zhao 8a01995668 Remove need for tracking bool and backing logo 2019-04-08 16:14:41 +09:00
David Zhao 376bed3a30 Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container 2019-04-08 15:24:59 +09:00
David Zhao a690302d00 Apply reviews 2019-04-08 15:24:09 +09:00
Dan Balasescu d7655bc579
Use .Value instead of cast 
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
 2019-04-08 11:22:01 +09:00
Dean Herbert 46ecaf3d6c
Merge branch 'master' into facade-container 2019-04-05 21:14:21 +09:00
David Zhao e06fe7950b Cleanup 2019-04-05 15:06:37 +09:00
David Zhao 5fa93f4a05 Add test for checking exception 2019-04-05 15:05:11 +09:00
smoogipoo 15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
David Zhao b1d74e57e5 Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size 2019-04-05 13:56:08 +09:00
David Zhao 7047f305a1 Apply reviews, add safety for multiple facades 2019-04-05 12:02:47 +09:00
David Zhao 6f5e9fe50d Correct xmldoc 2019-04-04 13:33:13 +09:00
David Zhao e89143d76b Add xmldoc for LogoTrackingPosition 2019-04-04 12:07:11 +09:00
David Zhao 6b5458a625 Clean up test cases 2019-04-04 11:22:05 +09:00
jorolf 5bc6042309 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-03 22:59:27 +02:00
David Zhao 8a40b27e8f Remove need for logo relativePositionAxes none 2019-04-03 20:32:53 +09:00
David Zhao 2ed945605e Fix Axes.None requirement for FacadeContainer 2019-04-03 19:57: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
David Zhao 020be50f03 Merge remote-tracking branch 'upstream/master' into facade-container 2019-04-02 11:28:44 +09:00
Dean Herbert c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert 612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00