75266 Commits

This Branch

This Branch

All Branches

• Use MaskingSmoothness to make masked diagonal edges smoother.
  Thomas Müller · 2017-02-04 11:06:26 +01:00
  6db70f8850
• Update framework.
  Thomas Müller · 2017-02-04 10:04:01 +01:00
  f4dfc477f4
• Re-use checkbox nub for option sliders and slightly re-structure.
  Thomas Müller · 2017-02-04 09:50:58 +01:00
  0edc64a08c
• Merge pull request #309 from peppy/general-fixes

  Uncomment corner radius post-fix.

  Dean Herbert · 2017-02-04 16:09:07 +09:00
  e00581d838
• Uncomment corner radius post-fix.
  Dean Herbert · 2017-02-04 16:05:24 +09:00
  c24edb583f
• Merge pull request #307 from peppy/general-fixes

  Fix autosize issues.

  Dean Herbert · 2017-02-04 16:00:40 +09:00
  db34448602
• Update framework.
  Dean Herbert · 2017-02-04 15:57:29 +09:00
  448f4d2a10
• Added back current work
  DrabWeb · 2017-02-03 15:22:02 -04:00
  0d8815bd37
• Fix background colour of dropdown menu item area.
  Dean Herbert · 2017-02-03 19:23:14 +09:00
  9f9278c837
• Fix much dropdown shit.
  Dean Herbert · 2017-02-03 19:13:10 +09:00
  4504440f80
• Better SearchTextBox focus handling.
  Dean Herbert · 2017-02-03 19:12:57 +09:00
  ddea76927f
• Update framework.
  Dean Herbert · 2017-02-03 19:12:38 +09:00
  2ffab66184
• Fix autosize issues.
  Dean Herbert · 2017-02-03 15:22:00 +09:00
  fc9badf20f
• Merge pull request #303 from peppy/options-refactor

  Global shadows and more sane font size setting.

  Dean Herbert · 2017-02-03 13:20:51 +09:00
  3f9b5ee6cb
• Missing namespace.
  Dean Herbert · 2017-02-03 13:16:45 +09:00
  36cfe54e59
• Merge remote-tracking branch 'upstream/master' into options-refactor

  # Conflicts:
  #	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
  #	osu.Game/Graphics/UserInterface/BackButton.cs
  #	osu.Game/Screens/Play/KeyCounter.cs

  Dean Herbert · 2017-02-03 13:16:07 +09:00
  16a01abc4d
• Merge pull request #302 from peppy/login-updates

  Move login screen to toolbar and update design (still not fully implemented).

  Dean Herbert · 2017-02-03 13:10:05 +09:00
  1f8df447c7
• Merge remote-tracking branch 'upstream/master' into login-updates
  Dean Herbert · 2017-02-03 12:48:52 +09:00
  a6fd7f46c3
• Merge pull request #298 from peppy/skip-button

  Make skip button work.

  Dean Herbert · 2017-02-03 12:47:53 +09:00
  4f89cc0784
• Merge pull request #299 from SirCmpwn/song-select-filtering

  Song select filtering

  Dean Herbert · 2017-02-03 12:37:51 +09:00
  e0868d2edf
• Merge branch 'master' into song-select-filtering
  Drew DeVault · 2017-02-02 09:25:27 -08:00
  52fb345e79
• @Tom94 pointed out this problem
  Drew DeVault · 2017-02-02 12:23:06 -05:00
  437cc834eb
• Merge pull request #1 from peppy/song-select-filtering-fixes

  Fixes inconsistencies and shortcomings of filtering.

  Drew DeVault · 2017-02-02 06:54:26 -08:00
  5136d10e0e
• Merge pull request #305 from EVAST9919/cursor_size

  Cursor scale

  Dean Herbert · 2017-02-02 21:19:30 +09:00
  30801b24c1
• Cursor scale
  Andrey Zavadskiy · 2017-02-02 14:44:56 +03:00
  16dc1460ad
• Framework update.
  Dean Herbert · 2017-02-02 19:38:01 +09:00
  7337ac93f4
• Fix keyboard controls not respecting search filter.
  Dean Herbert · 2017-02-02 19:37:35 +09:00
  966121a438
• Fix deselected group remaining visible after search.
  Dean Herbert · 2017-02-02 19:24:43 +09:00
  0c887d3a46
• Fix laggy animations, incorrect hiding logic.
  Dean Herbert · 2017-02-02 19:24:14 +09:00
  aec84ae725
• Replace incorrectly removed background logic

  I had earlier thought that removing this would solve the weirdness with
  starting the beatmap on any but the first difficulty, and forgot to
  replace it when I found the actual cause.

  Drew DeVault · 2017-02-01 19:32:30 -05:00
  c88a2fbf8a
• Fix use of previous value in Alpha check

  Frustratingly, this does not fix the problem of ghost groups

  Drew DeVault · 2017-02-01 19:28:08 -05:00
  9f9245cee3
• Remove constant boolean expressions
  Drew DeVault · 2017-02-01 19:15:22 -05:00
  5003b3738a
• Tidy up GetEnumerable
  Drew DeVault · 2017-02-01 19:12:24 -05:00
  3c7c3d1cb9
• Use OnChange instead of OnCommit

  OnCommit only gets fired when focus is lost

  Drew DeVault · 2017-02-01 19:12:24 -05:00
  2d691ca8d5
• Merge branch 'master' into options-refactor
  Dean Herbert · 2017-02-01 14:07:49 +09:00
  90fd9d9132
• Merge branch 'master' into skip-button

  # Conflicts:
  #	osu.Game/Graphics/UserInterface/BackButton.cs
  #	osu.Game/Screens/Play/Player.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-02-01 14:05:58 +09:00
  7ce5fc08ee
• Merge branch 'master' into login-updates
  Dean Herbert · 2017-02-01 13:23:22 +09:00
  e94c92b920
• Merge pull request #304 from DrabWeb/master

  Fixed quitting not working

  Dean Herbert · 2017-02-01 11:47:11 +09:00
  42eef9c19a
• Fixed quitting not working
  DrabWeb · 2017-01-31 22:33:28 -04:00
  0d53d3c4ff
• Merge remote-tracking branch 'upstream/master' into song-select-filtering
  Dean Herbert · 2017-02-01 10:09:14 +09:00
  046732b7e3
• Merge pull request #301 from DrabWeb/pause-overlay

  Pause overlay

  Dean Herbert · 2017-02-01 10:07:12 +09:00
  ea204ad606
• Fix poorly written BeatmapGroup logic
  Drew DeVault · 2017-01-31 20:04:17 -05:00
  3143e9d35e
• Made Player.canPause one line
  DrabWeb · 2017-01-31 21:02:58 -04:00
  c92418e000
• Minor cleanups
  Drew DeVault · 2017-01-31 19:55:36 -05:00
  0861eb79e4
• Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser
  DrabWeb · 2017-01-31 20:51:26 -04:00
  2c12568a0d
• Use OnCommit instead of OnChange simplifies things
  Drew DeVault · 2017-01-31 19:48:33 -05:00
  b1a55f6b5e
• Initialize previousFilter to string.Empty
  Drew DeVault · 2017-01-31 19:45:42 -05:00
  f740707712
• Fixed a bug where the user can double press escape to exit the song
  DrabWeb · 2017-01-31 20:44:59 -04:00
  13da75f149
• Fix extra click sound effect
  Drew DeVault · 2017-01-31 19:37:00 -05:00
  35a1479fc1
• Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
  DrabWeb · 2017-01-31 20:28:50 -04:00
  bcd41a2c8f