1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 00:27:25 +08:00
Commit Graph

405 Commits

Author SHA1 Message Date
Thomas Müller
44bedb5407 Merge branch 'master' into chat-improvement 2017-02-22 07:36:42 +01:00
Dean Herbert
190bed8939
Add top padding. 2017-02-22 13:38:22 +09:00
Dean Herbert
b7a9fd85ea
Assert single channel support for now. 2017-02-22 13:38:10 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert
6a83620589
Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
Dean Herbert
e3fa49dda7
Naively "send" messages that the user types (doesn't arrive yet). 2017-02-20 21:10:43 +09:00
Dean Herbert
7a2eedbd7e
Add message batching per-channel. 2017-02-20 21:09:34 +09:00
Dean Herbert
de87141e90 Remove unused using statements. 2017-02-19 18:39:54 +09:00
Dean Herbert
aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
Dean Herbert
ebc38917dc
Fix options sidebar not displaying correclty. 2017-02-18 22:29:20 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Thomas Müller
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText. 2017-02-15 21:37:43 +09:00
Jorolf
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
Dean Herbert
13ed7db361 Merge branch 'master' into general-fixes 2017-02-15 01:14:25 +09:00
Dean Herbert
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
4f9d1a6c39 Visually disable options which aren't yet wired up. 2017-02-14 00:36:50 +09:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Dean Herbert
e32ccb6153 Move scene graph init to ctors. 2017-02-12 19:39:54 +09:00
Dean Herbert
ac548dc9ec Rework notifications to be more flexible. 2017-02-12 14:50:42 +09:00
Dean Herbert
a14b7eb598 NotificationManager should become visible when receiving a notification (until we implement toasts). 2017-02-12 14:50:02 +09:00
Thomas Müller
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
Thomas Müller
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
Thomas Müller
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
Thomas Müller
2c4ecb990d Remove line break in MusicController 2017-02-11 16:23:15 +01:00
Dean Herbert
398ac6f459
Add assert to ensure complete is only called once. 2017-02-10 16:58:40 +09:00
Dean Herbert
dd8ec70bd5
Remove excess newline. 2017-02-10 16:57:49 +09:00
Dean Herbert
2da5628184
Merge remote-tracking branch 'upstream/master' into notifications-manager 2017-02-10 16:54:56 +09:00
Dean Herbert
8ec927899f
Implement notifications. 2017-02-10 16:30:23 +09:00
Andrey Zavadskiy
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
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