1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:22:54 +08:00
osu-lazer/osu.Game/Overlays
Dean Herbert 435e845067
Merge branch 'master' into DrabWeb/song-progress-graph
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Overlays/Pause/PauseProgressBar.cs
#	osu.Game/Overlays/Pause/PauseProgressGraph.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:20:27 +09:00
..
Dialog More code tidying. 2017-03-02 17:14:05 +09:00
Notifications FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Options FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Pause Merge branch 'master' into DrabWeb/song-progress-graph 2017-03-02 20:20:27 +09:00
Toolbar FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
ChatOverlay.cs Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
DialogOverlay.cs Fix incorrect event order. 2017-03-02 17:41:33 +09:00
DragBar.cs Merge branch 'master' into DrabWeb/song-progress-graph 2017-03-02 20:20:27 +09:00
LoginOverlay.cs Update framework 2017-02-26 11:22:58 +09:00
MusicController.cs Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
NotificationManager.cs FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
OptionsOverlay.cs FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00