Commit Graph

781 Commits

Author SHA1 Message Date
b7cfdff8d1 Update SliderBar to use IHasCurrentValue. 2017-04-10 15:30:17 +09:00
bb4a909de5 Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
fc7eef091f current_colour -> currentColour, fix masked away playlist items not fading colours 2017-04-09 09:08:11 -03:00
70756a069e Unused usings 2017-04-09 07:52:26 -03:00
241895c85b Proper playlist item text wrapping 2017-04-09 07:36:41 -03:00
67f1167172 Comments, play first song if current is nil and user presses play 2017-04-09 07:04:41 -03:00
7f2feab9e7 Proper search field focusing and exit on escape 2017-04-09 06:26:17 -03:00
a88c82705b Use playlist queue 2017-04-09 06:11:53 -03:00
fe17cb924d Cleanup 2017-04-09 04:50:35 -03:00
7b5f8800bd Reimplement with MusicController 2017-04-09 04:26:21 -03:00
2d6a2f41aa Reset MusicController 2017-04-09 04:12:30 -03:00
963cd09bd0 Merge https://github.com/ppy/osu into playlist 2017-04-09 04:04:13 -03:00
f65eaa6566 Show scroll dragger, change behaviour when selecting playing song 2017-04-09 03:52:48 -03:00
e1e9772d46 Flash buttons on click. 2017-04-08 19:28:29 +09:00
e40ad69a3b Adjust icon scale of play button. 2017-04-08 19:25:40 +09:00
b99cbe6962 Add back nice scaling of music controller buttons 2017-04-08 19:17:20 +09:00
166a78a15a Fix up comment in audio device options 2017-04-08 11:01:41 +02:00
ac073e22c9 Fix crash caused by multiple identical audio device names
The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
2017-04-07 17:00:34 +02:00
7e99fc47e2 wip 2017-04-07 16:54:54 +09:00
a9d938e7ed Fix brace style. 2017-04-07 15:57:00 +09:00
06776443eb Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:49:14 +09:00
2c2a4169c6 Better structure for button layout. 2017-04-07 15:28:18 +09:00
7d2af9310b Expose DragBar's seeking property. 2017-04-07 15:23:03 +09:00
3dbf4879c7 Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:18:58 +09:00
361e187949 Temporarily disable button scaling. 2017-04-07 14:33:58 +09:00
fa28e7bdc3 Improve clickability and visuals of MusicController buttons. 2017-04-07 14:09:26 +09:00
7c9f30c288 MusicController regression fixes. 2017-04-07 13:15:57 +09:00
bc4e0bfa8b Make DragBar animate seeks. 2017-04-07 13:14:41 +09:00
12d2102a88 Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Modes/UI/HudOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
863dc44c4d Some minor improvements. 2017-04-06 09:57:34 +09:00
009909dd4b Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 17:39:53 +03:00
7c74951454 Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
83322dc5cb Merge branch 'master' into hud_visibility 2017-04-03 11:51:11 +09:00
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
fa7fd6efe3 Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
4042b94e01 Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
768b3c4b4b Add better focus handling in the login form. 2017-03-28 00:08:27 +09:00
13272e6995 Make Avatar accept a user.
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
215b016f32 Initial implementation 2017-03-24 05:59:26 -03:00
4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
0dbc232ebf Rename all DropDown -> Dropdown. 2017-03-22 22:32:32 +08:00
6a4ca08578 Merge branch 'master' into controls 2017-03-22 22:28:19 +08:00
29c54d4d8b Merge https://github.com/ppy/osu into song-progress-graph 2017-03-22 08:50:17 -03:00