1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 04:47:38 +08:00
Commit Graph

500 Commits

Author SHA1 Message Date
Dean Herbert
d27a0db45c Enforce StartHidden on relevant overlays 2019-07-02 15:23:47 +09:00
Dean Herbert
2645967dc4 Fix wave-based overlays always being present before initial display 2019-07-02 15:17:35 +09:00
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
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
David Zhao
bfe44eb33d Remove SizeForFlow magic number 2019-03-28 15:40:58 +09:00
David Zhao
061527a260 Add new automated tests for logofacade, reset interpolation 2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
David Zhao
ca7a20585d Apply reviews, delete playerloader test 2019-03-27 17:28:53 +09:00
David Zhao
43c6a8d2e5 use a property instead 2019-03-27 11:44:50 +09:00
David Zhao
384eee3395 Remove DI requirement for the Facade in PlayerLoader 2019-03-27 11:32:26 +09:00
David Zhao
3fe52be77f Better tests, add documentation 2019-03-26 17:22:36 +09:00
David Zhao
be9ac39f54 Cleanup 2019-03-26 11:11:27 +09:00
David Zhao
35bf262d19 Merge remote-tracking branch 'upstream/master' into facade-container 2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145 Better tests and implementation 2019-03-26 10:48:29 +09:00
smoogipoo
6a9f005ed4 Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
2019-03-25 15:21:29 +09:00
Dean Herbert
5b83e97e9d
Fix typo 2019-03-25 13:38:50 +09:00
Dean Herbert
cd1b171df7 Refactor async load logic (not required due to stack presence) 2019-03-25 13:28:51 +09:00
LeNitrous
fee260fa03 remove empty argument list 2019-03-25 06:05:57 +08:00
LeNitrous
01ce8f161e make scaling container background use BackgroundScreenStack with BackgroundScreenDefault 2019-03-25 05:49:57 +08:00
David Zhao
d37968d88d Add better test for facade containers 2019-03-24 15:18:38 +09:00
David Zhao
6e98a8dd7c Initial implementation 2019-03-22 20:01:58 +09:00
David Zhao
e93311fdc9 DI facade 2019-03-22 19:01:32 +09:00
Dean Herbert
298c98871d Actually add the background 2019-03-20 20:18:08 +09:00
Dean Herbert
ba89bfee0c Define explicit method to add background
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
18de9e51c5 Formatting and naming improvements 2019-03-20 19:39:03 +09:00
David Zhao
f670e4664d Amend comment 2019-03-20 15:06:07 +09:00
David Zhao
2467ece020 store a field 2019-03-20 14:58:32 +09:00
David Zhao
86658e357b Override add instead 2019-03-20 14:55:52 +09:00
David Zhao
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
David Zhao
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
David Zhao
27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +09:00
David Zhao
0024a0bdb2 Remove unused using 2019-03-18 14:35:03 +09:00
David Zhao
eac7672c6b Clean up debug logging 2019-03-18 14:03:54 +09:00
David Zhao
8fc90bb9a0 Remove unused usings 2019-03-14 16:26:34 +09:00
David Zhao
8cdfb1fd61 Remove BlurrableBackgroundScreen, rework tests 2019-03-14 16:09:17 +09:00
David Zhao
8714902349 Handle all blurring directly from background 2019-03-14 14:02:46 +09:00
David Zhao
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +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
smoogipoo
e3d463a141 Formatting fixes 2019-03-06 19:26:48 +09:00
smoogipoo
ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
Shane Woolcock
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
Dean Herbert
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
Dean Herbert
86913e720f Remove extra space 2019-02-28 20:24:09 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
Dan Balasescu
99812bd448
Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
David Zhao
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +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
David Zhao
24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
David Zhao
bb01948283 Use .Value with new bindable changes 2019-02-22 20:44:02 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
David Zhao
76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
David Zhao
94bc552282 Fix backgrounds not fading out when replaced by storyboard, add test for this 2019-02-22 11:41:28 +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
David Zhao
97db8abd59 Remove unused includes 2019-02-21 18:34:11 +09:00
David Zhao
0677194f46 Move all storyboard show logic into UserDimContainer 2019-02-21 18:14:58 +09:00
David Zhao
3f000dfe2e Remove unnecessary region 2019-02-20 16:58:12 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
EVAST9919
559960036e update top score design 2019-02-05 14:48:35 +03:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
jorolf
54d8e4043f Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-01-27 23:32:48 +01:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
5ea6e8e247 Allow full osu!direct usage regardless of supporter status for now 2019-01-22 14:22:38 +09:00
Dean Herbert
3abfaea7ac Stop cursor from sticking to edges of scaled game window 2019-01-16 17:21:26 +09:00
Dean Herbert
2c2ed1ae47
Merge branch 'master' into profile-header-update 2019-01-10 18:34:39 +09:00
Dean Herbert
930d6382c7
Merge pull request #4016 from smoogipoo/fix-link-flow
Fix links not working in partially masked text flow
2019-01-10 15:19:58 +09:00
smoogipoo
4578d36a67 Add comment 2019-01-10 14:55:36 +09:00
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
smoogipoo
da98915c0c Fix links not working in partially masked text flow 2019-01-08 18:59:01 +09:00
Dean Herbert
199b614eba Fix masking being unapplied incorrectly 2019-01-08 13:36:07 +09:00
Dean Herbert
dd960e6a89 Remove unused variable 2019-01-08 12:50:42 +09:00
Dean Herbert
01f6199c49
Merge branch 'master' into profile-header-update 2019-01-04 16:38:42 +09:00
Dean Herbert
f2ccf70d1b Backdate license header for now 2019-01-04 15:37:27 +09:00
Dean Herbert
3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
jorolf
2fe80d5568 Update ProfileHeader to the new design 2018-12-22 21:50:25 +01:00
jorolf
15ae0cd70a Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2018-12-22 16:54:39 +01:00
jorolf
b4fa2d9049 WIP 2018-12-22 16:51:24 +01:00
Dean Herbert
1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
Dean Herbert
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
Roman Kapustin
7401fabb5d Extract external link opening to the ExternalLinkOpener class 2018-10-23 23:03:00 +03:00
Roman Kapustin
805f8d98c4 Implement warn about opening external links option 2018-10-22 23:57:37 +03:00
Roman Kapustin
b4c68f4cf7 Show a warning prior to opening external links 2018-10-22 23:16:57 +03:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
be1365fb18 Improve exception text 2018-09-14 11:58:23 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages 2018-08-24 17:26:33 +09:00
Dean Herbert
ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
Dean Herbert
53f556de9a Trim whitespace 2018-07-24 15:10:55 +02:00