Commit Graph

26 Commits

Author SHA1 Message Date
Thomas Müller e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller 4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Thomas Müller a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Huo Yaoyuan 6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Dean Herbert 2ff92ac25a Contract sidebar on click
Also makes queueing of expand more correct.
2017-07-13 17:09:12 +09:00
Dean Herbert 939e167d6a Correct offset settings vertically based on toolbar visibility 2017-07-13 17:09:12 +09:00
Dean Herbert f4fd263671 Fix settings not offsetting scroll operations by fixed header content 2017-07-13 17:09:12 +09:00
Dean Herbert 8460e29bcb Sidebar now pushes full settings out further 2017-07-13 17:09:12 +09:00
Thomas Müller 45d07e39c1 Update framework & change logic slightly 2017-07-08 12:41:15 +03:00
Thomas Müller b6f90dada5 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:21:11 +03:00
Huo Yaoyuan cadc191602 Merge branch 'master' into profile 2017-07-02 22:03:30 +08:00
Dean Herbert 28f0da606a Add OsuFocusedOverlayContainer with predefined sounds. 2017-06-28 10:18:12 -07:00
Huo Yaoyuan 18295a9b97 Handle scrolling in SectionsContainer. 2017-06-25 10:06:54 +08:00
MrTheMake ba783f984c Change usage of ScrollIntoView to ScrollTo in the setttings overlay 2017-06-24 13:36:57 +02:00
Dean Herbert 45d3c2cd52 Merge branch 'master' into profile 2017-06-21 16:40:17 +09:00
paparony03 62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Huo Yaoyuan 798d8711b8 Refactor SectionsContainer to generic. 2017-06-09 16:24:19 +08:00
Huo Yaoyuan e94d98fa84 Expose header background for SectionsContainer. 2017-06-07 22:11:38 +08:00
Dean Herbert 8544b45443 Update in line with framework 2017-05-30 22:23:51 +09:00
Dean Herbert d749fc516d Update focus handling in line with framework changes 2017-05-28 20:08:46 +09:00
Huo Yaoyuan 63259a3457 Fix depth of header background.
Thanks to the order of adding to parent container, the depth value is actually not needed.
2017-05-22 16:00:03 +08:00
Huo Yaoyuan f06f8b4dcd Make sidebar buttons working. 2017-05-21 04:33:05 +08:00
Huo Yaoyuan aa409ac1a9 Move SearchTextBox out of SettingsHeader. 2017-05-21 04:12:16 +08:00
Huo Yaoyuan 35712514a4 Update settings UI using SectionsContainer basically. 2017-05-21 03:50:04 +08:00
Dean Herbert efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00