75266 Commits

This Branch

This Branch

All Branches

• 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
• avg -> mostly
  Dean Herbert · 2017-01-29 15:16:38 +09:00
  3286713d11
• Formatting fixes.
  Dean Herbert · 2017-01-29 15:15:04 +09:00
  6027cc7afa
• Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).
  Dean Herbert · 2017-01-29 15:09:42 +09:00
  2e76874384
• Fix method which should be class.
  Dean Herbert · 2017-01-29 15:06:44 +09:00
  3125fa89ee
• Merge branch 'master' into more-beatmap-info

  # Conflicts:
  #	osu.Game/Screens/Select/BeatmapInfoWedge.cs

  Dean Herbert · 2017-01-29 14:47:42 +09:00
  77558abf58
• Adjusted the fade time of the pause overlay, put a fill behind the colour of PauseButton to fix an issue where the background gray is visible when the pause overlay is fading out
  DrabWeb · 2017-01-28 21:50:06 -04:00
  c75b234b1a
• Added PauseOverlay.SetRetries for updating the retry indicator
  DrabWeb · 2017-01-28 20:56:23 -04:00
  d0a22bfdd4
• Made resume not call until double the time of the fade animation
  DrabWeb · 2017-01-28 20:45:10 -04:00
  d4216eb539
• Removed depth setting from PauseOverlay, removed shadow offset on PauseButton color(why was that even there?), fixed the triangles on PauseButton not masking to the sheared container, made PauseButton call it's action on MouseUp instead of MouseDown to match stable
  DrabWeb · 2017-01-28 20:30:37 -04:00
  6b57456681
• Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar
  DrabWeb · 2017-01-28 16:55:42 -04:00
  582599a8de
• Merge pull request #268 from EVAST9919/login_fix

  Login improvements

  Dean Herbert · 2017-01-28 23:20:32 +09:00
  800e35b637
• Simplify checking
  Andrey Zavadskiy · 2017-01-28 17:01:11 +03:00
  72bc7f8786
• Removed explicit methods
  Andrey Zavadskiy · 2017-01-28 16:56:05 +03:00
  e25b8bb298
• Moved Config logic to OsuConfigManager
  Andrey Zavadskiy · 2017-01-28 13:10:05 +03:00
  f12a8ace3f
• Merge branch 'master' into login_fix
  EVAST9919 · 2017-01-28 11:24:08 +02:00
  ac7feafe9a
• Merge remote-tracking branch 'upstream/master' into song-select-filtering
  Drew DeVault · 2017-01-27 15:41:46 -05:00
  10897486ba
• Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place
  DrabWeb · 2017-01-27 15:28:39 -04:00
  feba3f35ba
• Reverted Player to upstream
  DrabWeb · 2017-01-27 14:29:51 -04:00
  601a5ed39c
• Working on design
  DrabWeb · 2017-01-27 14:18:57 -04:00
  490feac030
• Make skip button work.
  Dean Herbert · 2017-01-27 21:57:22 +09:00
  3e7503e860
• Renamed pauseDisableTime to pauseCooldown
  DrabWeb · 2017-01-27 08:13:39 -04:00
  e115120543
• TwoLayerButton
  Dean Herbert · 2017-01-27 21:08:36 +09:00
  420e61fa97
• Added commas to the end of UI creation to match how the rest of the project does, moved PauseButton audio loading to PauseOverlay, much more reliable(still using placeholder assets), made it so the player can't spam pause, cools down to one second
  DrabWeb · 2017-01-27 08:03:32 -04:00
  8c6d9bdf2e