1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-22 17:35:12 +08:00
Commit Graph

2651 Commits

Author SHA1 Message Date
Thomas Müller
85d3337257 Bump framework 2017-02-11 16:52:26 +01: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
7efa3415a4 Merge branch 'master' into followpoints 2017-02-10 20:59:45 +09:00
Damnae
2d155f6a5c Bring back the delay to what it was before. 2017-02-10 10:48:25 +01:00
Damnae
ec64455573 Add xml-doc. 2017-02-10 10:28:21 +01:00
Damnae
6f37c02868 Fix followpoints needing a DelayReset. 2017-02-10 10:07:52 +01:00
Dean Herbert
2da8e8fc9b Merge pull request #337 from peppy/desktop-unit-tests
Unit tests for desktop game project.
2017-02-10 17:27:31 +09:00
Dean Herbert
e23202c449
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests 2017-02-10 17:22:38 +09:00
Dean Herbert
370107142b Merge pull request #344 from peppy/notifications-manager
Implement notifications.
2017-02-10 17:07:30 +09: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
Thomas Müller
0f7cee230b Merge pull request #343 from peppy/general-fixes
Add pink glow to cursor because I can't fucking see it against white.
2017-02-10 08:45:00 +01:00
Dean Herbert
456fc5e375
Update framework. 2017-02-10 16:43:11 +09:00
Dean Herbert
8ec927899f
Implement notifications. 2017-02-10 16:30:23 +09:00
Dean Herbert
d5b7a8ce9e
Add pink glow to cursor because I can't fucking see it against white. 2017-02-10 16:24:40 +09:00
Damnae
4e6b6ab794 Abstract follow points into a separate class. 2017-02-10 08:10:24 +01:00
Damnae
77ee161be8 Add follow points. 2017-02-10 06:19:59 +01:00
Damnae
a504c73f33 Load beatmap data from an optional osb file. 2017-02-09 15:19:09 +01:00
Dean Herbert
c5cf6a6909 Merge pull request #338 from EVAST9919/warnings_fixes
Some Warning Fixes
2017-02-09 22:23:47 +09:00
Andrey Zavadskiy
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
Dean Herbert
4f7069520a
Framework bump. 2017-02-09 19:25:10 +09:00
Dean Herbert
becb65f702
Fix ParallaxContainer breaking with no mouse state present. 2017-02-09 19:25:04 +09:00
Dean Herbert
e0b7517535
Add desktop unit tests project. 2017-02-09 19:24:53 +09:00
Dean Herbert
829fb2605b
Fix visualtest regression. 2017-02-09 17:47:11 +09:00
Dean Herbert
60e206e587 Merge pull request #336 from Damnae/hitobject_stacking
Add hit object stacking.
2017-02-09 17:01:52 +09:00
Damnae
07c0057fab Update GetPathToProgress's xml-doc. 2017-02-09 08:57:28 +01:00
Thomas Müller
90e6112d57 Merge pull request #332 from peppy/unicode-support
Preliminary CJK support
2017-02-09 08:45:41 +01: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
Thomas Müller
6f45217b02 Merge pull request #334 from peppy/memory-fixes
Fix major memory leak when MusicController is hidden
2017-02-09 08:34:41 +01:00
Damnae
a79fde897b Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset. 2017-02-09 08:29:21 +01: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
711a442e97
Merge branch 'master' into overlay-improvements 2017-02-09 15:49:04 +09:00
Dean Herbert
e5615e273b
Merge branch 'master' into unicode-support 2017-02-09 15:48:37 +09:00
Dean Herbert
87ca97e447
Merge branch 'master' into memory-fixes 2017-02-09 15:48:20 +09:00
Dean Herbert
1ace39254d
Update framework. 2017-02-09 15:46:27 +09:00
Damnae
38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01: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
faa805e437
Fix SearchTextBox's handling of keyboard input to allow for IME input. 2017-02-09 12:33:24 +09:00
Dean Herbert
4337c66631
Framework update. 2017-02-09 11:45:30 +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
4fc2cd227c
Add CJK support via font Noto Medium. 2017-02-09 10:35:25 +09:00