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

1496 Commits

Author SHA1 Message Date
Dean Herbert
8c02709d74
Merge branch 'master' into fix-dropdown-styling 2019-06-25 19:28:37 +09: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