Commit Graph

394 Commits

Author SHA1 Message Date
32ce8cf723 Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
67105e6dfd Replace all usage of SpriteText with OsuSpriteText. 2017-02-15 21:37:43 +09:00
d42c5481b0 Make mode selector selected line non-relative. (#352)
* mode selector line has the correct length now
* calculation is now a 'one-liner'
* Line length is absolute now
* Line length is calculated inline
2017-02-15 13:48:49 +09:00
13ed7db361 Merge branch 'master' into general-fixes 2017-02-15 01:14:25 +09:00
f207da6041 Add/update license headers. 2017-02-14 18:17:35 +09:00
4f9d1a6c39 Visually disable options which aren't yet wired up. 2017-02-14 00:36:50 +09:00
aaaf7163e0 Update framework. 2017-02-13 17:46:50 +09:00
e32ccb6153 Move scene graph init to ctors. 2017-02-12 19:39:54 +09:00
ac548dc9ec Rework notifications to be more flexible. 2017-02-12 14:50:42 +09:00
a14b7eb598 NotificationManager should become visible when receiving a notification (until we implement toasts). 2017-02-12 14:50:02 +09:00
d3380631e8 Handle preferred audio device correctly when it is unavailable
This commit allows loading, storing, and displaying a preferred audio
device from config even when it is unavailable.
2017-02-11 16:33:54 +01:00
d79c8b9695 Update AudioDevicesOptions when devices are found or lost
This commit hooks up AudioDevicesOptions to the new events exposed by
the AudioManager of osu-framework. The device list is now updated when
new devices become available or are lost.
2017-02-11 16:29:33 +01:00
8394e2ff38 Update OptionDropDown value when items change
Items of OptionDropDown could previously already be changes on-the-fly,
but the selected value was not correctly updated (it kept the same index).
This commit addresses this problem.
2017-02-11 16:27:15 +01:00
2c4ecb990d Remove line break in MusicController 2017-02-11 16:23:15 +01:00
398ac6f459 Add assert to ensure complete is only called once. 2017-02-10 16:58:40 +09:00
dd8ec70bd5 Remove excess newline. 2017-02-10 16:57:49 +09:00
2da5628184 Merge remote-tracking branch 'upstream/master' into notifications-manager 2017-02-10 16:54:56 +09:00
8ec927899f Implement notifications. 2017-02-10 16:30:23 +09:00
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
d73093867d Merge pull request #320 from default0/audio-device-selection
Audio device selection
2017-02-09 16:45:29 +09:00
b7fd65070e Merge pull request #335 from peppy/overlay-improvements
Overlay improvements
2017-02-09 08:43:58 +01:00
23bc84fa3c Fix borked header. 2017-02-09 16:38:39 +09:00
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
0937424e0c Add base.PopOut calls to allow for passing away focus. 2017-02-09 13:57:52 +09:00
30bec0876d Make MusicController a focused overlay. 2017-02-09 13:57:49 +09:00
581ec765fb Improve transitions of MusicController. 2017-02-09 13:57:47 +09:00
18bb61897f Update overlay containers in lines with framework changes.
Allows closing the MusicController using escape.
2017-02-09 13:57:44 +09:00
f6956fc51c Fix MusicController doing work in the background when not visible. 2017-02-09 11:36:45 +09:00
b6398a1c77 Centralise toolbar size variables and adjust to design. 2017-02-08 20:30:45 +09:00
143cfae93a Login overlay should disappear when toolbar is hidden. 2017-02-08 20:30:45 +09:00
a7dac15d05 Toolbar is now toggled by the main menu. 2017-02-08 20:30:45 +09:00
2e119cd74f Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
5eb3ef3948 Make LoginOverlay and OptionsOverlay focused containers. 2017-02-08 15:13:32 +09:00
a6f02106a4 Use new placeholder logic. 2017-02-08 14:08:01 +09:00
446b277972 Don't allow clicks/hover events to pass through the options overlay. 2017-02-07 20:29:40 +09:00
6b011a50d2 Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
756fd78a88 Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
c222ce4403 Fix name 2017-02-06 21:19:27 +03:00
9b9ed32245 Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
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
ae03ef0787 Allow audio device selection in settings 2017-02-06 01:22:37 +01:00
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
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
0f72ef7dc2 Make pause buttons OnClick and not OnMouseDown. 2017-02-05 20:17:02 +01:00
c56478e154 Add missing license header. 2017-02-05 20:16:40 +01:00
d291103d22 Avoid triangle bleeding by masking the triangle container without smoothness. 2017-02-05 16:34:47 +01:00
a69c306334 Merge branch 'master' of github.com:ppy/osu into fix-login-button 2017-02-05 15:28:44 +01:00
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