19539 Commits

This Branch

This Branch

All Branches

• Remove code to check for other focused controls
  Drew DeVault · 2017-01-30 23:08:24 -05:00
  acdf64e1f7
• Refactor out Hidden

  Also fixes a bug I didn't think about before

  Drew DeVault · 2017-01-30 22:35:09 -05:00
  5852657205
• Removed empty ctor in PauseProgressGraph
  DrabWeb · 2017-01-30 16:18:34 -04:00
  fe09bab78f
• Woops forgot to add PauseButton
  DrabWeb · 2017-01-30 16:18:11 -04:00
  9d4a14074f
• Made TestCasePauseOverlay.retryCount reset on Retry, fixed an issue with PauseButton where if the user moved the cursor in/out very fast and clicked than the glow wouldn't fade out
  DrabWeb · 2017-01-30 16:15:56 -04:00
  c642660896
• Only grab focus if nothing else has it
  Drew DeVault · 2017-01-30 14:03:05 -05:00
  8d294a4eca
• Fix focus interactions with search text box
  Drew DeVault · 2017-01-30 13:56:33 -05:00
  144a87a247
• SearchTextBox: Don't handle Key.{Enter,Left,Right}
  Drew DeVault · 2017-01-30 10:16:55 -05:00
  09680196c9
• Update osu-framework
  Drew DeVault · 2017-01-30 10:07:40 -05:00
  9d07238a7d
• Relocate enums
  Drew DeVault · 2017-01-30 10:07:11 -05:00
  b32cbdbec2
• &&=, unnecessary null check
  Drew DeVault · 2017-01-30 09:49:58 -05:00
  fb431fd44e
• Use null coalesce operator where appropriate
  Drew DeVault · 2017-01-30 09:48:21 -05:00
  9a2cba8520
• Refactor FilterControl.Search
  Drew DeVault · 2017-01-30 09:48:12 -05:00
  7f3cb381a9
• Make BeatmapGroup.Hidden more intelligent
  Drew DeVault · 2017-01-30 09:47:04 -05:00
  42a2285ef3
• Update null background handling
  Drew DeVault · 2017-01-30 09:44:02 -05:00
  0a81fdbd10
• Add comments around cwd handling
  Drew DeVault · 2017-01-30 09:36:26 -05:00
  66d104394f
• Merge remote-tracking branch 'upstream/master' into song-select-filtering
  Drew DeVault · 2017-01-30 09:35:14 -05:00
  c00a558cb7
• Fix lack of visibility check causing weird hover regions.
  Dean Herbert · 2017-01-30 23:25:37 +09:00
  4cf2993db1
• Fix global hover regression.
  Dean Herbert · 2017-01-30 23:24:30 +09:00
  2aa924c104
• Move login screen to toolbar and update design (still not fully implemented).

  # Conflicts:
  #	osu.Game/Overlays/Options/General/LoginOptions.cs
  #	osu.Game/Overlays/Toolbar/Toolbar.cs

  Dean Herbert · 2017-01-30 22:55:35 +09:00
  74366c620b
• Add shadow to opaque toolbar elements.
  Dean Herbert · 2017-01-30 22:54:36 +09:00
  b2ec3508d5
• Move definition of MusicController's position out of itself.
  Dean Herbert · 2017-01-30 22:54:33 +09:00
  cbd6fe3f36
• Fixed an issue with PauseButton's glow not fading in
  DrabWeb · 2017-01-30 09:26:24 -04:00
  2f2f0ed9a3
• Moved delaying resuming to Player
  DrabWeb · 2017-01-30 09:06:26 -04:00
  740f6e5595
• Merge branch 'master' into add-flash-effects

  # Conflicts:
  #	osu.Game/Overlays/Options/General/LoginOptions.cs

  Dean Herbert · 2017-01-30 21:47:05 +09:00
  bdbe8501d3
• Renamed/removed various private constants
  DrabWeb · 2017-01-30 08:45:10 -04:00
  af8294f02c
• Fixed glow on PauseButton not updating
  DrabWeb · 2017-01-30 08:19:44 -04:00
  dbb9078e30
• Forgot one
  DrabWeb · 2017-01-30 08:08:38 -04:00
  9ab49247b2
• Removed excess parenthesis
  DrabWeb · 2017-01-30 08:07:37 -04:00
  8f6a6143d6
• Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses
  DrabWeb · 2017-01-30 08:04:39 -04:00
  ed3ed8251f
• Add custom implementation of TextBox.
  Dean Herbert · 2017-01-30 20:29:04 +09:00
  26e9533ff0
• Cleared out PauseProgressGraph
  DrabWeb · 2017-01-30 07:19:14 -04:00
  dcb02eff65
• Removed unnecessary change
  DrabWeb · 2017-01-30 06:24:44 -04:00
  ad33ae9431
• Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
  DrabWeb · 2017-01-30 06:14:28 -04:00
  015832f242
• Make buttons look closer to the design.
  Dean Herbert · 2017-01-30 18:10:30 +09:00
  b4c01f104b
• Changes on PauseButton to match design closer
  DrabWeb · 2017-01-30 05:04:57 -04:00
  62282076c7
• Small cleanups
  DrabWeb · 2017-01-30 04:43:06 -04:00
  f8cbc35f8e
• Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player
  DrabWeb · 2017-01-30 04:08:14 -04:00
  d70cbd37dd
• Adjust carousel radius slightly (flyte wanted it).
  Dean Herbert · 2017-01-30 16:55:47 +09:00
  2ad9377b37
• Make triangles opaque.
  Dean Herbert · 2017-01-30 16:53:12 +09:00
  f0d30cc873
• Merge pull request #300 from peppy/more-beatmap-info

  Beatmap details

  Dean Herbert · 2017-01-30 16:23:30 +09:00
  578b33dc64
• Remove unused field.
  Dean Herbert · 2017-01-30 16:08:31 +09:00
  a315db68ab
• Move BPM calculations to Beatmap.
  Dean Herbert · 2017-01-30 16:03:45 +09:00
  9f90b57543
• Fix non-matching shear angles.
  Dean Herbert · 2017-01-30 15:28:47 +09:00
  8f1e7ef19a
• Add StarDifficulty property and correct colouring of difficulty icons.
  Dean Herbert · 2017-01-30 15:26:28 +09:00
  0272c4b559
• Fix visualtests.
  Dean Herbert · 2017-01-30 15:15:56 +09:00
  1f2f2fa144
• Hook up icons better.
  Dean Herbert · 2017-01-30 13:35:40 +09:00
  2ed5cf7c91
• Use beatmap's play mode.
  Dean Herbert · 2017-01-30 13:14:02 +09:00
  0c2152f3d0
• Add the ability for individual game modes to report statistics for display at song select.
  Dean Herbert · 2017-01-30 13:12:30 +09:00
  e93f60396f
• Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups
  DrabWeb · 2017-01-29 05:04:48 -04:00
  28967cf77a