4131 Commits

• 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
• Merge remote-tracking branch 'upstream/master' into song-select-filtering
  Drew DeVault · 2017-01-30 09:35:14 -05:00
  c00a558cb7
• 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
• 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
• 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
• 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
• 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
• 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
• 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 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
• Make skip button work.
  Dean Herbert · 2017-01-27 21:57:22 +09:00
  3e7503e860
• TwoLayerButton
  Dean Herbert · 2017-01-27 21:08:36 +09:00
  420e61fa97
• Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed
  DrabWeb · 2017-01-27 07:11:22 -04:00
  3ed88ea043
• Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)
  DrabWeb · 2017-01-27 06:36:43 -04:00
  81de5a2097
• Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing
  DrabWeb · 2017-01-27 06:19:52 -04:00
  f35974021a
• wip
  Dean Herbert · 2017-01-27 19:14:44 +09:00
  5787b43586
• Added current work on pause overlay
  DrabWeb · 2017-01-27 05:24:49 -04:00
  fe265c01cb
• Move logo colour definitions local to their usage.
  Dean Herbert · 2017-01-27 17:57:52 +09:00
  6d44c5c8f1
• Add flash when activating the osu! logo.
  Dean Herbert · 2017-01-27 17:23:53 +09:00
  9b2669e1ae
• Add flash when activating a menu button.
  Dean Herbert · 2017-01-27 17:23:53 +09:00
  50e4c39e32
• Move osu! logo colour declarations to palette.
  Dean Herbert · 2017-01-27 17:23:53 +09:00
  a238637990
• Merge pull request #295 from peppy/songselect-footer

  Initial implementation of song select footer area.

  Dean Herbert · 2017-01-27 16:13:43 +09:00
  f3e9da609e
• Fixes following recent updates upstream
  Drew DeVault · 2017-01-26 21:31:28 -05:00
  f3c5c1f0b8
• Merge remote-tracking branch 'upstream/master' into song-select-filtering
  Drew DeVault · 2017-01-26 13:57:55 -05:00
  417933b7ec
• Add null check when popping backgrounds from the mode stack.
  Dean Herbert · 2017-01-27 00:41:34 +09:00
  f07b9591cd
• Add fail dialog and flow.
  Dean Herbert · 2017-01-27 00:41:34 +09:00
  139cac5e57
• Add support for failing.
  Dean Herbert · 2017-01-27 00:38:21 +09:00
  8c7bb4990c
• Move PlayerInputManager to own file.
  Dean Herbert · 2017-01-27 00:38:21 +09:00
  70271fee35
• Initial implementation of song select footer area.
  Dean Herbert · 2017-01-27 00:36:12 +09:00
  4a7b3cf391
• Move window/volume configuration to framework level.
  Dean Herbert · 2017-01-25 18:44:51 +09:00
  1853bbdda8
• Merge pull request #289 from UselessToucan/JudgementsCapacity

  Specify ScoreProcessor.Judgements.Capacity

  Dean Herbert · 2017-01-23 21:40:00 +09:00
  3a27178bb1
• Move Intro logic to OnEntering in line with framework changes.
  Dean Herbert · 2017-01-20 16:30:24 +08:00
  ae464fcace