3466 Commits

• Add back nice scaling of music controller buttons
  Thomas Müller · 2017-04-08 19:17:20 +09:00
  b99cbe6962
• Fix up comment in audio device options
  Thomas Müller · 2017-04-08 11:01:41 +02:00
  166a78a15a
• 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.

  Thomas Müller · 2017-04-07 17:00:34 +02:00
  ac073e22c9
• wip
  Dean Herbert · 2017-04-07 16:54:54 +09:00
  7e99fc47e2
• Fix brace style.
  smoogipooo · 2017-04-07 15:57:00 +09:00
  a9d938e7ed
• Merge branch 'music-controller-improvements' into song-progress-graph

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-04-07 15:49:14 +09:00
  06776443eb
• Better structure for button layout.
  Dean Herbert · 2017-04-07 15:28:18 +09:00
  2c2a4169c6
• Expose DragBar's seeking property.
  Dean Herbert · 2017-04-07 15:23:03 +09:00
  7d2af9310b
• Merge branch 'music-controller-improvements' into song-progress-graph

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-04-07 15:18:58 +09:00
  3dbf4879c7
• Temporarily disable button scaling.
  Dean Herbert · 2017-04-07 14:33:58 +09:00
  361e187949
• Improve clickability and visuals of MusicController buttons.
  Dean Herbert · 2017-04-07 14:09:26 +09:00
  fa28e7bdc3
• MusicController regression fixes.
  Dean Herbert · 2017-04-07 13:15:57 +09:00
  7c9f30c288
• Make DragBar animate seeks.
  Dean Herbert · 2017-04-07 13:14:41 +09:00
  bc4e0bfa8b
• 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

  Dean Herbert · 2017-04-07 09:22:18 +09:00
  12d2102a88
• Remove all trailing whitespaces in this repo.
  Huo Yaoyuan · 2017-04-06 16:21:18 +08:00
  411988f038
• Fix filename mismatch.
  Huo Yaoyuan · 2017-04-06 16:05:41 +08:00
  9b1e010dcc
• Merge branch 'master' into hud_visibility
  Dean Herbert · 2017-04-06 13:40:10 +09:00
  efe82ef88c
• Some minor improvements.
  Dean Herbert · 2017-04-06 09:57:34 +09:00
  863dc44c4d
• Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
  Andrey Zavadskiy · 2017-04-04 17:39:53 +03:00
  009909dd4b
• Update bindables.

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
  #	osu.Game/Screens/Ranking/ResultModeButton.cs
  #	osu.Game/Screens/Ranking/Results.cs

  Dean Herbert · 2017-04-04 11:34:13 +09:00
  7c74951454
• Merge branch 'master' into hud_visibility
  Dean Herbert · 2017-04-03 11:51:11 +09:00
  83322dc5cb
• Container->Wrapper.
  Dean Herbert · 2017-04-02 16:17:13 +09:00
  bfa2e68bfb
• Update async load usage to new style.
  Dean Herbert · 2017-04-02 15:56:12 +09:00
  6f1fff4ee7
• Hud Visibility
  Andrey Zavadskiy · 2017-03-31 16:43:31 +03:00
  d7c39a00b4
• Fix mode selector not invoking a re-filter.
  Dean Herbert · 2017-03-29 19:48:13 +09:00
  fa7fd6efe3
• Update references.
  Dean Herbert · 2017-03-28 21:26:20 +09:00
  f7dc7e9bb9
• Use DelayedLoadContainer in more places.
  Dean Herbert · 2017-03-28 15:28:58 +09:00
  4042b94e01
• Add better focus handling in the login form.
  Dean Herbert · 2017-03-28 00:08:27 +09:00
  768b3c4b4b
• Make Avatar accept a user.

  Add UpdateableAvatar to handle the toolbar use-case.

  Dean Herbert · 2017-03-28 00:08:26 +09:00
  13272e6995
• Initial implementation
  DrabWeb · 2017-03-24 05:59:26 -03:00
  215b016f32
• Merge branch 'master' into song-progress-graph
  Dean Herbert · 2017-03-23 17:44:22 +09:00
  4d61424abd
• Enforce readonly private members where possible.
  Dean Herbert · 2017-03-23 13:50:08 +09:00
  54e1b24fe9
• Rename all DropDown -> Dropdown.
  Huo Yaoyuan · 2017-03-22 22:32:32 +08:00
  0dbc232ebf
• Merge branch 'master' into controls
  Huo Yaoyuan · 2017-03-22 22:28:19 +08:00
  6a4ca08578
• Merge https://github.com/ppy/osu into song-progress-graph
  DrabWeb · 2017-03-22 08:50:17 -03:00
  29c54d4d8b
• Fix usages of CircularContainer in line with framework changes.
  Dean Herbert · 2017-03-22 19:35:03 +09:00
  fbe08436d2
• Merge branch 'master' into controls
  Huo Yaoyuan · 2017-03-22 08:54:03 +08:00
  e217c67bcf
• Use Bindable for DropDown.
  Huo Yaoyuan · 2017-03-22 07:49:21 +08:00
  b46ded7794
• Merge branch 'master' into leaderboards
  Dean Herbert · 2017-03-22 08:24:49 +09:00
  8983bbcaad
• Update to DropDown and Menu.
  Huo Yaoyuan · 2017-03-22 07:18:53 +08:00
  f0edf5d3d3
• Merge branch 'master' into seperateCursorSize
  Dean Herbert · 2017-03-22 08:11:45 +09:00
  b00f86d809
• renamed CursorSize to MenuCursorSize
  Jorolf · 2017-03-21 17:16:23 +01:00
  82d6129063
• Hide letterbox position sliders
  Andrey Zavadskiy · 2017-03-21 18:24:19 +03:00
  943bd737c4
• Hard-code text size in cases it wasn't set.
  smoogipooo · 2017-03-20 13:48:06 +09:00
  d27f37beb5
• Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
  Dean Herbert · 2017-03-19 18:51:53 +09:00
  5d0adc6454
• fixed typo
  Jorolf · 2017-03-18 15:22:03 +01:00
  80de15d935
• Fix NaN when dragging music controller

  When dragging music controller we divide by the dragged distance.
  When dragging to the origin of the drag this resulted in NaN.
  Now, we check for this and use 0 in this case.

  Thomas Müller · 2017-03-18 12:46:12 +01:00
  9af0104e3e
• Merge branch 'master' into leaderboards
  Seth · 2017-03-17 18:23:01 -03:00
  4aea06be22
• Separated menu and gameplay cursor size
  Jorolf · 2017-03-17 18:40:03 +01:00
  8568e1536c
• AlwaysReceiveInput and InternalContains.
  Dean Herbert · 2017-03-16 17:38:36 +09:00
  ab8a5afdb9