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

374 Commits

Author SHA1 Message Date
Dean Herbert
d73093867d Merge pull request #320 from default0/audio-device-selection
Audio device selection
2017-02-09 16:45:29 +09:00
Thomas Müller
b7fd65070e Merge pull request #335 from peppy/overlay-improvements
Overlay improvements
2017-02-09 08:43:58 +01:00
Dean Herbert
23bc84fa3c Fix borked header. 2017-02-09 16:38:39 +09:00
Dean Herbert
d05b544d0d
Merge branch 'master' into audio-device-selection
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
2017-02-09 16:21:28 +09:00
Dean Herbert
0937424e0c
Add base.PopOut calls to allow for passing away focus. 2017-02-09 13:57:52 +09:00
Dean Herbert
30bec0876d
Make MusicController a focused overlay. 2017-02-09 13:57:49 +09:00
Dean Herbert
581ec765fb
Improve transitions of MusicController. 2017-02-09 13:57:47 +09:00
Dean Herbert
18bb61897f
Update overlay containers in lines with framework changes.
Allows closing the MusicController using escape.
2017-02-09 13:57:44 +09:00
Dean Herbert
f6956fc51c
Fix MusicController doing work in the background when not visible. 2017-02-09 11:36:45 +09:00
Dean Herbert
b6398a1c77
Centralise toolbar size variables and adjust to design. 2017-02-08 20:30:45 +09:00
Dean Herbert
143cfae93a
Login overlay should disappear when toolbar is hidden. 2017-02-08 20:30:45 +09:00
Dean Herbert
a7dac15d05
Toolbar is now toggled by the main menu. 2017-02-08 20:30:45 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
Dean Herbert
5eb3ef3948
Make LoginOverlay and OptionsOverlay focused containers. 2017-02-08 15:13:32 +09:00
Dean Herbert
a6f02106a4
Use new placeholder logic. 2017-02-08 14:08:01 +09:00
Dean Herbert
446b277972
Don't allow clicks/hover events to pass through the options overlay. 2017-02-07 20:29:40 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
756fd78a88
Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
Danil Yarancev
c222ce4403 Fix name 2017-02-06 21:19:27 +03:00
Dean Herbert
9b9ed32245
Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
default0
6add77c30b Rename Standard device option to Default
Changed the name of the option for using the default audio device
to "Default" for consistency with english windows. Also changed
the "" value to string.Empty for consistency with the Frameworks
treatment of this special value.
2017-02-06 12:26:32 +01:00
default0
ae03ef0787 Allow audio device selection in settings 2017-02-06 01:22:37 +01:00
default0
b4f30dd417 Rework OptionDropdowns to be more versatile
The existing OptionDropdown only supported enums and was thus renamed
to OptionEnumDropDown. A new OptionDropdown has been created in its
place to allow binding to arbitrary values, with a set of user-provided
items.
2017-02-06 01:21:26 +01:00
Thomas Müller
91f0951255 Handle OnMouseDown in PauseOverlay such that players can not click circles through the overlay while paused. 2017-02-05 20:17:29 +01:00
Thomas Müller
0f72ef7dc2 Make pause buttons OnClick and not OnMouseDown. 2017-02-05 20:17:02 +01:00
Thomas Müller
c56478e154 Add missing license header. 2017-02-05 20:16:40 +01:00
Thomas Müller
d291103d22 Avoid triangle bleeding by masking the triangle container without smoothness. 2017-02-05 16:34:47 +01:00
Thomas Müller
a69c306334 Merge branch 'master' of github.com:ppy/osu into fix-login-button 2017-02-05 15:28:44 +01:00
Thomas Müller
ba38a27274 Fix incorrect sizing of login button.
When logging in or out the size of the login button would not correctly update,
resulting in a messed-up flow of toolbar buttons. This branch fixes the problem
by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay
bypasses auto sizing by using a new framework feature.
2017-02-05 15:17:54 +01:00
Andrey Zavadskiy
43dcf0bbc1 PauseButton Triangles 2017-02-05 13:47:37 +03:00
Dean Herbert
714c94b7a8 Fix toolbar sizing hackiness. 2017-02-04 22:27:05 +09:00
Dean Herbert
57d97ba2e9 Make triangles look better in many cases. 2017-02-04 22:09:44 +09:00
Dean Herbert
0fefa50b54 Add padding beneath sliders in options. 2017-02-04 20:57:08 +09:00
Thomas Müller
1913ec659a Merge branch 'master' of github.com:ppy/osu into better-option-sliders 2017-02-04 12:07:21 +01:00
Thomas Müller
6db70f8850 Use MaskingSmoothness to make masked diagonal edges smoother. 2017-02-04 11:06:26 +01:00
Thomas Müller
0edc64a08c Re-use checkbox nub for option sliders and slightly re-structure. 2017-02-04 09:50:58 +01:00
Dean Herbert
4504440f80 Fix much dropdown shit. 2017-02-03 19:13:10 +09:00
Dean Herbert
fc9badf20f Fix autosize issues. 2017-02-03 15:22:00 +09:00
Dean Herbert
16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Dean Herbert
a6fd7f46c3 Merge remote-tracking branch 'upstream/master' into login-updates 2017-02-03 12:48:52 +09:00
Drew DeVault
52fb345e79 Merge branch 'master' into song-select-filtering 2017-02-02 09:25:27 -08:00
Dean Herbert
aec84ae725 Fix laggy animations, incorrect hiding logic. 2017-02-02 19:24:14 +09:00
Dean Herbert
90fd9d9132 Merge branch 'master' into options-refactor 2017-02-01 14:07:49 +09:00
Dean Herbert
e94c92b920 Merge branch 'master' into login-updates 2017-02-01 13:23:22 +09:00
DrabWeb
0d53d3c4ff Fixed quitting not working 2017-01-31 22:33:28 -04:00
Dean Herbert
ea204ad606 Merge pull request #301 from DrabWeb/pause-overlay
Pause overlay
2017-02-01 10:07:12 +09:00
DrabWeb
91a5d0b3cf Made requested changes 2017-01-31 09:17:47 -04:00
DrabWeb
bf54ae86ea Added flash when clicking a PauseButton 2017-01-31 08:07:05 -04:00
Dean Herbert
6803b1a8db Sidebar button style pass. 2017-01-31 19:58:38 +09:00