58147 Commits

This Branch

This Branch

All Branches

• Update OsuDropDownMenu for Framework-Changes

  Since the DropDownMenu in the framework has changed it was necessary
  to update the GetDropDownItems override of OsuDropDownMenu to
  accomodate the new structure of the framework.

  default0 · 2017-02-06 01:17:50 +01:00
  b230b5cfb9
• Handle OnMouseDown in PauseOverlay such that players can not click circles through the overlay while paused.
  Thomas Müller · 2017-02-05 20:17:29 +01:00
  91f0951255
• Make pause buttons OnClick and not OnMouseDown.
  Thomas Müller · 2017-02-05 20:17:02 +01:00
  0f72ef7dc2
• Add missing license header.
  Thomas Müller · 2017-02-05 20:16:40 +01:00
  c56478e154
• Avoid triangle bleeding by masking the triangle container without smoothness.
  Thomas Müller · 2017-02-05 16:34:47 +01:00
  d291103d22
• Merge pull request #317 from Tom94/fix-login-button

  Fix incorrect sizing of login button.

  Dean Herbert · 2017-02-05 23:43:15 +09:00
  fe86a9e431
• Merge pull request #315 from Tom94/better-visibility

  Better visibility

  Dean Herbert · 2017-02-05 23:39:02 +09:00
  65feda0505
• Merge branch 'master' of github.com:ppy/osu into fix-login-button
  Thomas Müller · 2017-02-05 15:28:44 +01:00
  a69c306334
• Merge branch 'master' of github.com:ppy/osu into better-visibility
  Thomas Müller · 2017-02-05 15:28:10 +01:00
  6d59429c29
• Update framework.
  Thomas Müller · 2017-02-05 15:24:19 +01:00
  faf6461f30
• Update framework.
  Thomas Müller · 2017-02-05 15:22:57 +01:00
  f477b7d8a0
• Fix incorrect sizing of login button.

  When logging in or out the size of the login button would not correctly update,
  resulting in a messed-up flow of toolbar buttons. This branch fixes the problem
  by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay
  bypasses auto sizing by using a new framework feature.

  Thomas Müller · 2017-02-05 15:17:54 +01:00
  ba38a27274
• Merge pull request #313 from default0/default0/beatmap-import

  Implement Beatmap Import via drag&drop

  Dean Herbert · 2017-02-05 22:37:42 +09:00
  65471364a7
• Implement Beatmap Import via drag&drop
  default0 · 2017-02-05 13:32:08 +01:00
  299c4923c3
• Merge pull request #316 from EVAST9919/overlay_buttons

  Better look of PauseButton

  Dean Herbert · 2017-02-05 21:08:18 +09:00
  beddf5cd6d
• PauseButton Triangles
  Andrey Zavadskiy · 2017-02-05 13:47:37 +03:00
  43dcf0bbc1
• Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
  Thomas Müller · 2017-02-05 09:40:58 +01:00
  8271b139e9
• Fix volume control not showing is mouse-wheel is turned during its fade-out animation.
  Thomas Müller · 2017-02-05 09:40:12 +01:00
  aae5f4f9e2
• Merge pull request #312 from peppy/general-fixes

  General fixes.

  Thomas Müller · 2017-02-04 15:08:35 +01:00
  52f6a09319
• Cursor becomes vector.
  Dean Herbert · 2017-02-04 22:56:56 +09:00
  d97f02a219
• Fix toolbar sizing hackiness.
  Dean Herbert · 2017-02-04 22:27:05 +09:00
  714c94b7a8
• Make triangles look better in many cases.
  Dean Herbert · 2017-02-04 22:09:44 +09:00
  57d97ba2e9
• Add padding beneath sliders in options.
  Dean Herbert · 2017-02-04 20:57:08 +09:00
  0fefa50b54
• Make sliderbar lines smoother when scrolling.
  Dean Herbert · 2017-02-04 20:56:14 +09:00
  97d52188b2
• Fix sliderbar lines lagging behind nub.
  Dean Herbert · 2017-02-04 20:55:26 +09:00
  1e3266a9d2
• Update framework.
  Dean Herbert · 2017-02-04 20:55:03 +09:00
  ce689032c7
• Merge pull request #310 from Tom94/better-option-sliders

  Re-use checkbox nub for option sliders and slightly re-structure.

  Dean Herbert · 2017-02-04 20:13:01 +09:00
  bbda20c90d
• Merge branch 'master' of github.com:ppy/osu into better-option-sliders
  Thomas Müller · 2017-02-04 12:07:21 +01:00
  1913ec659a
• OsuNub -> Nub.
  Thomas Müller · 2017-02-04 12:06:53 +01:00
  d6714324df
• Merge pull request #311 from Tom94/better-smoothness

  Use MaskingSmoothness to make masked diagonal edges smoother.

  Dean Herbert · 2017-02-04 20:02:41 +09:00
  5fcad99682
• Update framework.
  Thomas Müller · 2017-02-04 11:51:46 +01:00
  42ea3ea04f
• 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