110 Commits

• 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
• some formatting
  Jorolf · 2017-04-04 17:27:08 +02:00
  b2731bb0a1
• add Tooltips
  Jorolf · 2017-04-02 18:19:59 +02:00
  e835b19d4a
• Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
  Andrey Zavadskiy · 2017-04-01 21:03:19 +03:00
  3574dac780
• Merge branch 'master' of git://github.com/ppy/osu into details
  Jorolf · 2017-04-01 14:12:20 +02:00
  072a77b4d9
• Bring VisualTests up-to-date.
  Dean Herbert · 2017-03-31 18:00:14 +09:00
  2b847aa2f4
• there's probably something in here I overlooked
  Jorolf · 2017-03-30 17:32:18 +02:00
  0d4f2c59a5
• Merge branch 'master' of git://github.com/ppy/osu into details
  Jorolf · 2017-03-29 15:47:00 +02:00
  6982529481
• Update references and framework.
  Dean Herbert · 2017-03-29 09:54:00 +09:00
  ab97967237
• Added ratings and different bar rotations
  Jorolf · 2017-03-28 17:12:54 +02:00
  909fdb647c
• Edited pause visual test
  Andrey Zavadskiy · 2017-03-28 15:03:12 +03:00
  1c166bdf32
• Add metadata details
  Jorolf · 2017-03-24 23:02:24 +01:00
  d8724e5e3e
• Merge branch 'master' into taiko_drawable_drawing

  Conflicts:
  	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-03-24 15:11:56 +09:00
  20e80a758a
• Merge branch 'master' into song-progress-graph
  Dean Herbert · 2017-03-23 17:44:22 +09:00
  4d61424abd
• Merge branch 'master' into beatmap-detail-tabs
  Dan Balasescu · 2017-03-23 17:13:02 +09:00
  e9a061c709
• Even though it was 5 minutes ago what was I thinking
  DrabWeb · 2017-03-23 01:34:06 -03:00
  67421cdf1c
• Remove visual test(pretty useless)
  DrabWeb · 2017-03-23 01:25:30 -03:00
  8c99a8b103
• Tab control
  DrabWeb · 2017-03-23 00:22:31 -03:00
  c173c4b7ee
• Merge branch 'master' into taiko_playfield_2
  Dan Balasescu · 2017-03-23 11:10:23 +09:00
  2c580f43e9
• Merge branch 'master' into taiko_drawable_drawing
  Dan Balasescu · 2017-03-23 10:44:00 +09:00
  e3bc837b61
• Merge remote-tracking branch 'origin/master' into taiko_playfield_2
  smoogipooo · 2017-03-23 08:49:20 +09:00
  790997db90
• Merge https://github.com/ppy/osu into song-progress-graph
  DrabWeb · 2017-03-22 08:50:17 -03:00
  29c54d4d8b
• Refactor WorkingBeatmap

  Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
  from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
  or so.

  Drew DeVault · 2017-03-22 05:57:08 -04:00
  cc2b4c5c5b
• Add taiko playfield.
  smoogipooo · 2017-03-21 14:58:34 +09:00
  27a21cd23d
• Merge branch 'master' into leaderboards
  Seth · 2017-03-17 18:23:01 -03:00
  4aea06be22
• Add initial taiko note circles.
  smoogipooo · 2017-03-17 22:01:06 +09:00
  b629766892
• Added and styled FilterTabControls
  Kelvin · 2017-03-14 19:49:40 -07:00
  40bcc63a90
• Merge branch 'master' into leaderboards
  Seth · 2017-03-14 10:07:33 -03:00
  21a9996225
• Use AutoGenerateBindingRedirects instead of explicit app.config.
  Huo Yaoyuan · 2017-03-14 03:20:33 +08:00
  db104d04d3
• Merge https://github.com/ppy/osu into leaderboards
  DrabWeb · 2017-03-13 09:36:16 -03:00
  dbc8d513f9
• Basic implementation of score UI
  DrabWeb · 2017-03-04 03:37:34 -04:00
  a112b354f0
• Merge remote-tracking branch 'upstream/master' into replay

  # Conflicts:
  #	osu.Game.Modes.Catch/CatchRuleset.cs
  #	osu.Game.Modes.Mania/ManiaRuleset.cs
  #	osu.Game.Modes.Taiko/TaikoRuleset.cs
  #	osu.Game/Screens/Play/Player.cs

  Dean Herbert · 2017-03-04 13:17:01 +09:00
  9e1383fa48
• Merge pull request #385 from DrabWeb/mod-overlay

  Mod select

  Dean Herbert · 2017-03-03 21:09:08 +09:00
  6f3b59268a
• Merge branch 'master' into tournament_drawings
  Dean Herbert · 2017-03-03 20:48:07 +09:00
  dc6a728cce
• Merge branch 'master' into mod-overlay
  Seth · 2017-03-03 04:12:42 -04:00
  fde509ab1d
• Merge branch 'master' into tournament_drawings
  Dan Balasescu · 2017-03-03 13:06:18 +09:00
  09a2d39e3e
• Implemented beatmap options overlay
  DrabWeb · 2017-03-02 08:40:55 -04:00
  b856fb5991