RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,707 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

1608 Commits

Author SHA1 Message Date
Dean Herbert 7b2227c505 Fix xmldoc 2019-07-02 17:47:19 +09:00
Dean Herbert 6c7b97931e Avoid using a BufferedContainer for backgrounds unless required 2019-07-02 17:45:46 +09:00
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
smoogipoo 23df1a5d42 Merge remote-tracking branch 'HollyHacker/master' into abstract-menu 2019-06-28 13:42:56 +09:00
Dean Herbert 7d5554c2ac
Re-use the back button game-wide (#5149) 
Re-use the back button game-wide

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-06-25 20:50:28 +09:00
Dean Herbert f51be4c4fe Adjust transitions a tad 2019-06-25 20:23:34 +09:00
Dean Herbert 75b78d5e27
Reduce size of dropdown chevron (#5150) 
Reduce size of dropdown chevron

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
 2019-06-25 20:05:52 +09:00
Dean Herbert a3de369c20 Reduce size of dropdown chevron 2019-06-25 19:32:00 +09:00
Dean Herbert 8c02709d74
Merge branch 'master' into fix-dropdown-styling 2019-06-25 19:28:37 +09:00
smoogipoo 5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
smoogipoo d9927204f8 Relieve OsuScreen of back button input duties 2019-06-25 18:33:18 +09:00
jorolf 4d8f49b9bc update code to work with https://github.com/ppy/osu-framework/pull/2568 2019-06-24 23:17:07 +02:00
Dan Balasescu 18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Unknown 16a4805f1f add OsuNumberBox with basic tests 2019-06-21 15:04:52 +02:00
smoogipoo 7054f54a64 Use OsuScrollContainer for osu menus 2019-06-21 12:33:49 +09:00
Dean Herbert 133c1fc0f1
Merge branch 'master' into remove-osu-checkbox-bindable 2019-06-20 11:33:39 +09:00
Dean Herbert 07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert 26d5c2d85a Remove local implementation of bindable in OsuCheckbox 2019-06-17 19:37:24 +09:00
Dean Herbert 1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
Dean Herbert bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert 15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40: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
Dean Herbert 6973e1af4d
Fix incorrect xmldoc in OsuAnimatedButton (#4984) 
Fix incorrect xmldoc in OsuAnimatedButton
 2019-06-11 18:45:23 +09:00
smoogipoo a9758ba813 Merge remote-tracking branch 'origin/master' into fix-checkbox-overlap 2019-06-11 18:26:42 +09:00
smoogipoo e5417416a2 Remove braces 2019-06-11 18:24:50 +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 71e15fe0f1 Fix incorrect xmldoc in OsuAnimatedButton 2019-06-11 01:21:01 +09:00
Dean Herbert cd89633dee Rename variable to match 2019-06-09 17:07:23 +09:00
Dean Herbert d500f3605e Fix checkboxes with long labels overlapping nub 2019-06-09 16:48:03 +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 358a08cf9d Merge branch 'master' into OsuHoverContainer 2019-06-07 11:40:33 +09:00
Dean Herbert b93446688c
Fix sizing of OsuAnimatedButton and OsuClickableContainer (#4898) 
Fix sizing of OsuAnimatedButton and OsuClickableContainer
 2019-06-07 00:17:39 +09:00
smoogipoo c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +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 2e3d392a9f Mark OsuButton as abstract 
Not being used directly, so we probably shouldn't support it for now.
 2019-06-04 22:12:55 +09:00
Dean Herbert 4e7f2b8f47
Merge branch 'master' into osu-clickable-container 2019-06-04 17:42:17 +09:00
Dean Herbert 80a66b8b3a Merge remote-tracking branch 'upstream/master' into audio-refactor-update 2019-06-04 12:08:21 +09:00
smoogipoo 53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
Dean Herbert 171fc14776 Fix editor regressions 2019-06-03 16:34:09 +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
Dean Herbert dff7053a07
Merge branch 'master' into more_button_update 2019-06-03 11:48:05 +09:00
smoogipoo c211f1d0fe Merge remote-tracking branch 'Joehuu/master' into changelog-overlay 2019-05-31 12:28:28 +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
Dean Herbert e7b9d1efa3 Isolate alpha usage in OsuCheckbox 2019-05-27 01:49:24 +09:00
Dean Herbert cb62008280 Cleanup pass 2019-05-23 11:23:37 +09:00
Dean Herbert 1d5b7cdec0 Add ExpandingBar UI element 2019-05-22 16:44:47 +09:00
Dean Herbert 92c991494d Fix (and rename) ExpandingBar 2019-05-22 16:38:15 +09:00
Dean Herbert 8025a97b2b Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-21 17:18:23 +09:00
Dan Balasescu 2024cdf16d
Merge branch 'master' into hover-container-disabled-hover-effect 2019-05-21 17:04:50 +09:00
Dan Balasescu ad2a495dbc
Merge branch 'master' into screen-title-custom-icon 2019-05-21 15:56:56 +09:00
Dean Herbert d09101b43c Merge remote-tracking branch 'upstream/master' into hover-container-disabled-hover-effect 2019-05-21 15:02:44 +09:00
Dean Herbert 5ed1540a12 Handle unhover state change better 2019-05-21 15:02:31 +09:00
Dan Balasescu 67ac76aae7
Merge branch 'master' into move-tooltip-text 2019-05-21 15:00:09 +09:00
Dean Herbert e0da919fe9 Allow custom icon specification in ScreenTitle 
Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
 2019-05-21 14:10:21 +09:00
Dean Herbert 587e4bb5d5 Remove unnecessary getters from ScreenTitle 2019-05-21 14:10:16 +09:00
Dean Herbert 89e62c3d30 Only play OsuHoverContainer hover effect if action is present 2019-05-21 14:07:40 +09:00
Dean Herbert e7c8c4f787 Fix incorrectly changed colour 2019-05-21 14:02:17 +09:00
Dean Herbert 247dad7e86 Use OsuColour for profile overlay 2019-05-21 13:54:19 +09:00
Dean Herbert bc962bf8f0 Move TooltipText to OsuClickableContainer 2019-05-21 13:51:38 +09:00
Dean Herbert 808b45ac64 Allow custom icon specification in ScreenTitle 
Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
 2019-05-21 11:50:03 +09:00
Dean Herbert 6c26d6fdf9 Remove unnecessary getters from ScreenTitle 2019-05-21 11:13:36 +09:00
Dean Herbert 455301de2c Use OsuColour for profile overlay 2019-05-20 15:58:40 +09:00
Dean Herbert dae315ec0a Move TooltipText to OsuClickableContainer 2019-05-19 11:28:24 +09:00
Dean Herbert 3fa1545ea4 Huge refactor pass focusing on ChangelogContent 2019-05-19 02:09:08 +09:00
Dean Herbert 9bc3aa3d46 Move new classes for now 2019-05-17 19:15:25 +09:00
Dean Herbert dbc42fd59e Remove StreamColour class and implement locally 2019-05-17 18:31:53 +09:00
Dean Herbert 5d33a742c6 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-16 18:55:28 +09:00
Dean Herbert 409d89eecf Match header titles with web (pt size) 2019-05-16 18:53:52 +09:00
Dan Balasescu 29a415de48
Merge branch 'master' into TextLengthLimit 2019-05-15 19:21:01 +09:00
Dean Herbert cc558cf073 Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay 2019-05-14 13:36:17 +09:00
Dean Herbert 4abe987e11 Add new colour palette 2019-05-14 13:28:16 +09:00
Dean Herbert 27ca094421 Update outdated licence headers 2019-05-13 17:14:52 +09:00
Dean Herbert 31b72f168d Fix deprecated calls and code styling (partly) 2019-05-13 00:46:22 +09:00
Dean Herbert 34f54aa945 Resolve compile-time issues 2019-05-13 00:36:05 +09:00
Dean Herbert 943e1574a4
Merge branch 'master' into changelog-overlay 2019-05-13 00:24:18 +09:00
smoogipoo 13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +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 ccc804a9b2 get everything working again 2019-04-04 00:24:42 +02: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 bcd51afea1 Fix osu! icon font name mismatch 2019-04-02 19:55:46 +09:00
Dean Herbert bc1077ed73 Remove remaining FontAwesome reference 2019-04-02 19:55:34 +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
smoogipoo d8af5e1c5a Update in-line with drawnode changes 2019-04-02 11:56:22 +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 772545dd22 Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-29 18:21:20 +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 3e28c4ae0a Fix remaining IconUsage changes 2019-03-29 14:03:00 +09:00
Dean Herbert de47e0a8e8 Merge remote-tracking branch 'upstream/master' into screen-title-class 2019-03-29 14:01:08 +09:00
Dean Herbert 2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +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
Dean Herbert 9a11a08acc Update textbox usages 2019-03-23 02:00:27 +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
jorolf 7873022a8b Merge branch 'master' of git://github.com/ppy/osu into screen-title-class 2019-03-21 22:18:59 +01:00
jorolf 454c82c49e Don't go outside of the container bounds 2019-03-21 22:18:45 +01: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