765 Commits

• Merge remote-tracking branch 'upstream/master' into social-browser
  Dean Herbert · 2017-06-07 17:38:06 +09:00
  1de296747f
• Bring framework up-to-date
  Dean Herbert · 2017-06-07 15:32:50 +09:00
  5f537780cf
• Merge branch 'master' into social-browser
  Dean Herbert · 2017-06-05 19:16:28 +09:00
  bf971f6613
• Fix namespaces and class names
  Dean Herbert · 2017-06-05 16:47:42 +09:00
  af6f8bbd89
• Merge remote-tracking branch 'upstream/master' into ingame_options
  Dean Herbert · 2017-06-05 14:53:37 +09:00
  0cb1df35e9
• Remove unused using
  Thomas Müller · 2017-06-03 20:05:51 +02:00
  0afb188cde
• Merge branch 'master' into separate-skip
  Thomas Müller · 2017-06-03 17:45:57 +02:00
  04925594ca
• Trim whitespace
  Thomas Müller · 2017-06-03 17:45:44 +02:00
  d498a4a022
• Move skip button into its own test, because it is no longer two-layered
  Thomas Müller · 2017-06-03 17:33:24 +02:00
  8cd2f509ef
• Remove TestCaseTooltip
  Thomas Müller · 2017-06-03 17:28:34 +02:00
  3daae480d2
• update osu to use the framework's TooltipContainer
  Jorolf · 2017-06-03 14:50:35 +02:00
  a43890ffb4
• Incorrect test data spelling
  DrabWeb · 2017-05-31 21:32:50 -03:00
  c9403c5200
• Applied suggested changes
  EVAST9919 · 2017-05-30 12:23:53 +03:00
  e737ded382
• Fix usings.
  smoogipooo · 2017-05-30 17:36:42 +09:00
  7416952eb3
• Make replay settings match design colours.
  smoogipooo · 2017-05-30 17:02:04 +09:00
  72fa50f944
• Applied suggested changes
  EVAST9919 · 2017-05-29 19:00:29 +03:00
  08219ccb42
• Merge branch 'master' into social-browser
  Dean Herbert · 2017-05-29 18:35:22 +09:00
  5e4558cc54
• Merge branch 'master' into ingame_options
  Dan Balasescu · 2017-05-29 18:12:02 +09:00
  6918368afc
• Merge branch 'master' into breadcrumbs
  Dean Herbert · 2017-05-29 15:59:37 +09:00
  4a0c8fb5dd
• Merge remote-tracking branch 'origin/master' into mania-holdnote-input
  smoogipooo · 2017-05-29 10:57:49 +09:00
  27d6cb6275
• Merge branch 'master' into social-browser
  Seth · 2017-05-28 15:11:00 -03:00
  0e087994a1
• Merge branch 'master' into user-panel-test-data
  Dean Herbert · 2017-05-28 23:19:16 +09:00
  20c7a5e931
• Update method names in line with framework changes
  Dean Herbert · 2017-05-28 18:34:12 +09:00
  bdeaf2dbb4
• More xmldoc and few Title text fixes
  EVAST9919 · 2017-05-28 00:56:11 +03:00
  743dfcc130
• Change UserPanel test case data to use always available covers
  DrabWeb · 2017-05-27 17:27:11 -03:00
  e7087f22ea
• More reliable test data
  DrabWeb · 2017-05-27 17:23:14 -03:00
  7bdbd3713a
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-27 02:25:03 +03:00
  bedcf04043
• Add BreadcrumbControl
  DrabWeb · 2017-05-26 07:49:45 -03:00
  cbe36259c3
• Merge remote-tracking branch 'origin/master' into mania-holdnote-input
  smoogipooo · 2017-05-26 19:01:10 +09:00
  24ff599901
• Cleanup
  DrabWeb · 2017-05-26 02:16:56 -03:00
  fc67582c3f
• Add displaying users
  DrabWeb · 2017-05-26 02:00:38 -03:00
  e19a4f5e6f
• Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser
  DrabWeb · 2017-05-26 00:54:03 -03:00
  8fca0fddb3
• Merge branch 'master' into mania-holdnote-input
  Dan Balasescu · 2017-05-24 22:17:13 +09:00
  40e63a0870
• General cleanup + more xmldocs.
  smoogipooo · 2017-05-24 21:57:38 +09:00
  946cd4bfa3
• Test case improvements.
  smoogipooo · 2017-05-24 20:54:01 +09:00
  4ef18ff135
• Implement basic hold note + tick input.
  smoogipooo · 2017-05-24 20:45:01 +09:00
  dcf879687d
• Merge branch 'master' into drawable-multiplayer-room
  Seth · 2017-05-24 04:39:57 -03:00
  3094a8267f
• Merge branch 'master' into user-panel
  Dean Herbert · 2017-05-24 16:32:09 +09:00
  3134f92051
• CI fixes
  DrabWeb · 2017-05-24 03:08:48 -03:00
  a25c504965
• Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
  DrabWeb · 2017-05-24 02:40:00 -03:00
  ba2627d4e2
• Keep one object per file
  DrabWeb · 2017-05-24 02:37:27 -03:00
  4490596f5f
• Hide status bar when Status is null
  DrabWeb · 2017-05-24 00:45:56 -03:00
  2be1b00a76
• Replace "Connected as _" in login form with a UserPanel
  DrabWeb · 2017-05-24 00:23:48 -03:00
  247d8e9b21
• Merge branch 'master' into osu-direct
  Dean Herbert · 2017-05-24 12:16:34 +09:00
  4ee11764b8
• Make result counts scroll with the panels
  DrabWeb · 2017-05-23 14:34:34 -03:00
  4f17a4fe91
• Fix visual test failing.
  smoogipooo · 2017-05-23 18:06:31 +09:00
  76fe4af9a6
• More cleanups.
  smoogipooo · 2017-05-23 15:29:38 +09:00
  836bf930a0
• Use SortedList + BinarySearch to find control points at time values.
  smoogipooo · 2017-05-23 15:20:32 +09:00
  002a0e99a2
• Split ControlPoint into different types.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/UI/Column.cs

  smoogipooo · 2017-05-23 14:03:40 +09:00
  3cdfd2eef5
• Move RoomStatus to a class instead of enum
  DrabWeb · 2017-05-22 21:13:57 -03:00
  9798117d53