1338 Commits

• Merge remote-tracking branch 'upstream/master' into no-more-colourinfo
  Dean Herbert · 2017-07-25 10:14:48 +09:00
  3c7546e2c1
• Merge branch 'master' into drawableflag-ctor
  Dean Herbert · 2017-07-25 09:46:27 +09:00
  b528568547
• Handle control key with OnKeyUp/OnKeyDown.
  Huo Yaoyuan · 2017-07-24 22:14:21 +08:00
  47b4ef5cd2
• Make OsuScreen.Ruleset protected.
  Huo Yaoyuan · 2017-07-24 21:47:31 +08:00
  c2e5788ed1
• Merge branch 'master' into fixes
  Huo Yaoyuan · 2017-07-24 20:50:33 +08:00
  e0b1057b87
• Merge branch 'master' into master
  Dean Herbert · 2017-07-24 18:23:36 +09:00
  84f12c722f
• check removed beatmap being null, check promptdelete beatmap being default
  tgi74000 · 2017-07-24 10:25:33 +02:00
  d0e99f0c95
• Do not trigger Random if no Beatmaps are imported
  tgi74000 · 2017-07-24 09:57:12 +02:00
  5d30efc090
• Less verbose DrawableFlag constructor.
  Nabile Rahmani · 2017-07-24 09:25:49 +02:00
  c80f5c708a
• Use Colour instead of ColourInfo
  Dean Herbert · 2017-07-23 13:06:16 +02:00
  64f2e2dc32
• Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel
  EVAST9919 · 2017-07-23 13:27:03 +03:00
  d9e9ab22db
• Rename EasingTypes to Easing
  Thomas Müller · 2017-07-22 20:53:53 +02:00
  e68675f970
• Make BeatmapCarousel inherit from OsuScrollContainer
  EVAST9919 · 2017-07-21 13:13:53 +03:00
  388fcfb295
• Merge branch 'master' of github.com:ppy/osu into better-transforms

  # Conflicts:
  #	osu-framework

  Thomas Müller · 2017-07-21 11:15:26 +02:00
  2cd8f6b30c
• Merge branch 'master' into fix-carousel-debounce-race
  Dean Herbert · 2017-07-21 17:44:04 +09:00
  9a33e77d63
• Make method to flush filter requests
  Dean Herbert · 2017-07-21 17:20:52 +09:00
  12b6b80d5c
• Fix selection changing on entering song select

  Conditional was backwards, easy fix.

  Dean Herbert · 2017-07-21 06:15:44 +09:00
  b4dddc98ee
• Fix carousel filter debounce causing a race condition

  Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.

  Dean Herbert · 2017-07-21 05:58:58 +09:00
  fb2f1224b3
• Merge branch 'master' into fix-empty-carousel
  Thomas Müller · 2017-07-20 21:15:58 +02:00
  e84d8cc020
• Merge branch 'master' into fix-empty-carousel
  Thomas Müller · 2017-07-20 21:04:45 +02:00
  4e33efd41f
• Merge branch 'master' into fix-beatmap-select-race
  Thomas Müller · 2017-07-20 21:04:40 +02:00
  518a7c460e
• Merge branch 'master' into fix-working-beatmap-double-load
  Thomas Müller · 2017-07-20 20:35:31 +02:00
  e21822cdeb
• Merge branch 'master' into fix-empty-carousel
  Thomas Müller · 2017-07-20 20:31:06 +02:00
  01ff7e8f4b
• Merge branch 'master' into fixes
  Dean Herbert · 2017-07-20 19:46:50 +09:00
  451f92772a
• Merge branch 'master' into no-set-exclusive
  Thomas Müller · 2017-07-20 12:11:32 +02:00
  8108f3e78d
• Switch to correct ruleset when changing beatmap

  This is only really noticeable when using the MusicController to change tracks while at song select.

  Dean Herbert · 2017-07-20 19:10:20 +09:00
  6e0b7b81f8
• Fix footer button light fading incorrectly

  Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.

  Dean Herbert · 2017-07-20 18:08:51 +09:00
  577740d329
• Centralise TrackManager.AddItem logic to avoid duplicate adds
  Dean Herbert · 2017-07-20 17:46:33 +09:00
  3bdd4d7d02
• Remove usage of SetExclusive

  Also immediately disposes WorkingBeatmaps on ValueChanged.

  Dean Herbert · 2017-07-20 16:45:44 +09:00
  67b95926c4
• Remove unnecessary count check
  Dean Herbert · 2017-07-20 15:34:44 +09:00
  4f10256182
• Add required null check
  Dean Herbert · 2017-07-20 15:16:07 +09:00
  61c665f239
• Fix selection not being reset correct when changing between rulesets

  Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.

  Dean Herbert · 2017-07-20 15:12:20 +09:00
  a59557f039
• Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
  Dean Herbert · 2017-07-20 14:06:09 +09:00
  c130981184
• Fix hitting down and enter at song select causing a hard-crash

  Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.

  Dean Herbert · 2017-07-20 11:50:52 +09:00
  15eb6954da
• Don't rely on BeatmapSetInfo being present
  Dean Herbert · 2017-07-20 09:23:11 +09:00
  8d727b898f
• Merge branch 'master' of github.com:ppy/osu into better-transforms

  # Conflicts:
  #	osu-framework

  Thomas Müller · 2017-07-19 19:15:51 +02:00
  c4619f614a
• Make DefaultBeatmap private get.
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  35157ca6b8
• Remove incorrect looping reset behaviour

  Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.

  Dean Herbert · 2017-07-19 15:55:16 +09:00
  c8593a38c8
• Remove many now unnecessary null-checks
  Dean Herbert · 2017-07-19 15:45:23 +09:00
  64ebc01a3b
• Give song select a better default background whecn the beatmap's can't be loaded
  Dean Herbert · 2017-07-19 15:16:55 +09:00
  8e8767cd37
• Make Beatmap (bindable) non-nullable.
  Dean Herbert · 2017-07-19 15:16:53 +09:00
  d0dea33faa
• Simplify state changes
  Dean Herbert · 2017-07-19 15:16:51 +09:00
  0846414c5b
• Dummy beatmap has dummy ruleset
  Dean Herbert · 2017-07-19 15:16:48 +09:00
  632d2e8ba5
• Move dummy to BeatmapDatabase
  Dean Herbert · 2017-07-19 15:16:43 +09:00
  f168ee660c
• Move DummyWorkingBeatmap to a more global level (OsuScreen)
  Dean Herbert · 2017-07-19 15:16:39 +09:00
  21984ba764
• Stop playing previous beatmap even if new beatmap has no track
  Dean Herbert · 2017-07-19 15:16:36 +09:00
  df60fc0f0a
• Add a dummy beatmap provider for use in BeatmapInfoWedge
  Dean Herbert · 2017-07-19 15:16:33 +09:00
  e47faf4e85
• Merge branch 'master' of https://github.com/ppy/osu into better-transforms

  # Conflicts:
  #	osu-framework
  #	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
  #	osu.Game/Overlays/DragBar.cs

  Thomas Müller · 2017-07-18 15:16:02 +03:00
  4d8261fe0b
• Implement Ctrl+Enter in PlaySongSelect.
  Huo Yaoyuan · 2017-07-18 15:55:21 +08:00
  9cd895c249
• Merge branch 'master' into songselect-preview-fix
  Dean Herbert · 2017-07-18 13:05:03 +09:00
  b5035ec245