146 Commits

• Merge branch 'master' into multiplayer-room-inspector
  Dean Herbert · 2017-06-23 21:55:18 +09:00
  81de1bd5a7
• Merge branch 'master' into timingchange-rework
  Dan Balasescu · 2017-06-15 16:23:51 +09:00
  6fd37ebc32
• Merge branch 'master' into us
  Dean Herbert · 2017-06-13 15:46:53 +09:00
  178e2b716e
• Update nuget packages

  - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820

  Dean Herbert · 2017-06-13 11:50:46 +09:00
  41d4aee4f5
• Context Menu
  EVAST9919 · 2017-06-12 12:56:07 +03:00
  1711258038
• Add small test case to demonstrate usage.
  smoogipooo · 2017-06-12 17:31:24 +09:00
  56244e0134
• Merge branch 'master' into social-browser
  Dean Herbert · 2017-06-05 19:16:28 +09:00
  bf971f6613
• Merge remote-tracking branch 'upstream/master' into ingame_options
  Dean Herbert · 2017-06-05 14:53:37 +09:00
  0cb1df35e9
• Merge branch 'master' into separate-skip
  Thomas Müller · 2017-06-03 17:45:57 +02:00
  04925594ca
• 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
• Basic layout
  DrabWeb · 2017-05-30 05:12:11 -03:00
  3aa1f35127
• 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 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
• 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 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
• MultiplayerRoom -> Room
  DrabWeb · 2017-05-22 12:44:58 -03:00
  03f6cded84
• Added UserPanel and UserStatus
  DrabWeb · 2017-05-22 03:11:42 -03:00
  7ce3b73ecd
• Initial cleanup
  DrabWeb · 2017-05-22 00:07:15 -03:00
  e5ee7096f8
• Merge https://github.com/ppy/osu into roompanel
  DrabWeb · 2017-05-21 22:37:00 -03:00
  c4e6870c12
• Add files to project, update with framework changes
  DrabWeb · 2017-05-21 22:36:46 -03:00
  bc980b60ac
• Naming fixes
  EVAST9919 · 2017-05-18 20:21:58 +03:00
  f2af31aceb
• options -> settings
  EVAST9919 · 2017-05-18 11:39:22 +03:00
  83a89ce22d
• Added osu!direct header and filter control
  DrabWeb · 2017-05-17 05:58:34 -03:00
  9ba356f2c6
• ingame options basic logic
  EVAST9919 · 2017-05-17 10:36:57 +03:00
  1a4025ab3c
• Add basic on-screen display
  Dean Herbert · 2017-05-16 15:03:03 +09:00
  5e5ad9a899
• Change all instances of options to settings where applicable
  Dean Herbert · 2017-05-15 10:55:29 +09:00
  eaaba11586
• Merge branch 'master' into mania-notes

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

  smoogipooo · 2017-05-08 12:12:40 +09:00
  e3b01e7b8c
• Adjust namespaces.

  Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.

  Dean Herbert · 2017-05-05 13:00:05 +09:00
  c9ba1ac4f6
• Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
  EVAST9919 · 2017-05-04 17:35:41 +03:00
  66c858030a
• Added testcase
  EVAST9919 · 2017-05-04 11:58:37 +03:00
  57c4232416
• Add basic DrawableNote.
  smoogipooo · 2017-05-03 20:12:27 +09:00
  956a7288fb
• Add initial column design.
  smoogipooo · 2017-05-01 17:00:41 +09:00
  4aea18b673
• Merge branch 'master' into tooltips
  Dean Herbert · 2017-04-20 15:08:26 +09:00
  4ca27a5395
• Merge branch 'master' into tooltips
  Jorolf · 2017-04-19 13:51:39 +02:00
  af9a45fd6c
• Add a basic implementation of the new design results screen.
  Dean Herbert · 2017-04-18 22:22:14 +09:00
  d51b37cb44
• Mode -> Ruleset.
  Dean Herbert · 2017-04-18 16:05:58 +09:00
  fbd26a1d5e
• Merge branch 'master' of git://github.com/ppy/osu into tooltips
  Jorolf · 2017-04-17 14:45:46 +02:00
  dd26f9fcac
• Explicitly set C# 6.0 for now.
  Adrian Kaz Scherzinger · 2017-04-16 06:44:08 +09:00
  60f7879875
• Merge remote-tracking branch 'upstream/master' into song-progress-graph

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

  Dean Herbert · 2017-04-14 11:25:00 +09:00
  09195a03a2
• Merge branch 'master' of git://github.com/ppy/osu into tooltips

  # Conflicts:
  #	osu.Game/Graphics/Cursor/MenuCursor.cs

  Jorolf · 2017-04-13 23:12:07 +02:00
  f6f75fac74
• Merge branch 'master' into details
  Dean Herbert · 2017-04-12 20:25:51 +09:00
  157ad17606
• Update nuget packages.

  Includes fix in OpenTK for focus issues.

  Dean Herbert · 2017-04-12 19:35:16 +09:00
  c0338a82e7
• changes and fixes
  Jorolf · 2017-04-11 14:02:56 +02:00
  fb5952186c
• 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
• Merge branch 'master' into details
  Jorolf · 2017-04-06 15:42:00 +02:00
  e59c0a770f
• Fix Pause/Fail testcase
  Andrey Zavadskiy · 2017-04-06 12:27:45 +03:00
  c6f4cff2e7