667 Commits

• Merge branch 'master' into fix-ruleset-changing
  Dan Balasescu · 2017-08-18 13:40:52 +09:00
  cc6a5824f0
• Remove usage of HideOnEscape
  Dean Herbert · 2017-08-16 22:56:32 +09:00
  7e21ddb5eb
• Remove all usage of DI to retrieve InputManager

  Uses GetContainingInputManager instead, as per framework changes.

  Dean Herbert · 2017-08-15 14:30:50 +09:00
  6ded194c53
• Fix leaderboard icons not displaying correctly
  Dean Herbert · 2017-08-14 12:52:20 +09:00
  9e1ffa27dc
• Merge branch 'master' into fix-ruleset-changing
  Dean Herbert · 2017-08-13 11:14:41 +09:00
  94b8d1de8b
• Fix some formatting issues
  Dean Herbert · 2017-08-13 10:36:57 +09:00
  fe2911f165
• Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)
  Shane Woolcock · 2017-08-12 19:52:09 +09:30
  096e574401
• Move a lot of code to framework
  Dean Herbert · 2017-08-11 16:11:46 +09:00
  48d4ed55e9
• Move line inside if
  Dean Herbert · 2017-08-04 17:20:05 +09:00
  e8021c2b92
• Use removeAutoModOnResume as a field.
  Huo Yaoyuan · 2017-08-04 15:34:11 +08:00
  74facb32b4
• Merge branch 'master' into fixes
  Huo Yaoyuan · 2017-08-04 13:49:03 +08:00
  62b3540fd6
• Provide Autoplay mod in Ruleset.
  Huo Yaoyuan · 2017-08-04 00:25:24 +08:00
  eb9972581e
• Pass input state in OnSelected.
  Huo Yaoyuan · 2017-08-04 00:09:41 +08:00
  44fd0eb78b
• Allow Rulesets to create a non-FontAwesome icon

  This also
  - Renames TextAwesome to SpriteIcon.
  - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).

  Dean Herbert · 2017-08-03 14:36:21 +09:00
  0d9ea97828
• Merge branch 'master' into scroll_to_selected
  Dean Herbert · 2017-08-01 11:06:32 +09:00
  c8b5c1b8a5
• Applied suggestions
  EVAST9919 · 2017-07-31 14:20:12 +03:00
  700c7753c3
• Merge branch 'master' into fixes
  Huo Yaoyuan · 2017-07-31 17:51:34 +08:00
  df3f75b842
• Removed useless variable
  EVAST9919 · 2017-07-29 17:51:11 +03:00
  62365090ad
• Fix hard crash when pressing random if no beatmaps avaliable
  EVAST9919 · 2017-07-29 17:42:32 +03:00
  6b3a81f567
• Added "scroll to" container
  EVAST9919 · 2017-07-29 17:33:20 +03:00
  e121b119be
• Add ScrollToSelected method
  EVAST9919 · 2017-07-29 16:03:17 +03:00
  8458622c4d
• Fix potential sequen of execution issues in BeatmapCarousel
  Dean Herbert · 2017-07-28 15:05:08 +09:00
  e691dd12c5
• Merge remote-tracking branch 'upstream/master' into database-tidy
  Dean Herbert · 2017-07-27 17:41:29 +09:00
  6f4efbeda6
• *Database -> *Store

  Welcome back BeatmapManager

  Dean Herbert · 2017-07-27 16:56:41 +09:00
  5f53426a9a
• Make BeatmapStore's BeatmapDatabase private
  Dean Herbert · 2017-07-27 15:34:13 +09:00
  cbe7b08642
• Simplify and document DatabaseStore API
  Dean Herbert · 2017-07-27 15:06:10 +09:00
  96b08b8777
• Schedule API callback to own scheduler

  Fixes race condition when API returns a failure after exiting song select. Note that the API does also schedule to the correct thread, but this schedule ensures the callback is never run, which is what we want in this case.

  Dean Herbert · 2017-07-27 12:55:14 +09:00
  31bfa00d60
• Split out BeatmapDatabase into BeatmapStore

  Hide database functionality at a lower level in preparation from eventually making it private.

  Dean Herbert · 2017-07-26 16:31:34 +09:00
  9e20a02c0a
• Reshuffle namespaces
  Dean Herbert · 2017-07-26 13:22:46 +09:00
  fce580d717
• 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