85 Commits

• Merge branch 'master' into disallow-beatmap-change
  Dean Herbert · 2018-06-04 10:53:04 +09:00
  4b604bf055
• Fix potential double-disposal of player if PlayerLoader is finalised
  Dean Herbert · 2018-05-30 15:48:26 +09:00
  5872b61988
• Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

  # Conflicts:
  #	osu.Game/Overlays/Music/PlaylistOverlay.cs
  #	osu.Game/Screens/OsuScreen.cs

  smoogipoo · 2018-05-28 18:01:15 +09:00
  a3470f9ec3
• Merge branch 'master' into player_loader_input_toggles
  Dean Herbert · 2018-05-25 18:38:12 +09:00
  28aa6faef9
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• Do not change Margin for player settings groups on the PlayerLoader screen
  Roman Kapustin · 2018-05-21 18:57:01 +03:00
  30956b64aa
• expose two Bindables with split logic instead of one with mixed logic
  Aergwyn · 2018-05-21 15:53:55 +02:00
  b7e3ea348b
• Rename for better understanding

  ShowOverlays -> AllowOverlays
  ShowOverlaysOnEnter -> HideOverlaysOnEnter

  Aergwyn · 2018-05-21 09:42:29 +02:00
  1482bca147
• Show InputSettings on the PlayerLoader screen
  Roman Kapustin · 2018-05-09 17:31:52 +03:00
  ccf82cacb0
• Add PlayerLoader TestCase and fix dummy beatmap load procedure
  Dean Herbert · 2018-04-20 17:30:27 +09:00
  8bf25542cb
• Merge remote-tracking branch 'upstream/master' into peppy-async-screens
  Dean Herbert · 2018-04-20 16:52:58 +09:00
  de85436534
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Remove composer from player loader
  Joehu · 2018-04-12 16:46:46 -07:00
  128446e51d
• Scren async changes in line with framework changes

  Makes editor not stutter on load, amongst other screens.

  Dean Herbert · 2018-03-30 14:58:11 +09:00
  31ade986a7
• Fix background loaded player never being disposed if early exit occurs
  Dean Herbert · 2018-03-23 15:04:40 +09:00
  b56eee1927
• Move cancel code to exit paths for screen
  Dean Herbert · 2018-03-22 13:01:40 +09:00
  917334a39a
• Fix retry not allowing continuing beyond PlayerLoader

  Resolves #2265.

  Dean Herbert · 2018-03-22 02:10:31 +09:00
  8f71d53c17
• Avoid scheduling during non-current screen
  Dean Herbert · 2018-03-14 12:09:19 +09:00
  ea649f9650
• Apply formatting changes
  Dean Herbert · 2018-03-14 11:44:19 +09:00
  ef8d595914
• Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging
  Dean Herbert · 2018-03-14 11:43:33 +09:00
  c3a3d76b88
• Add debouncing to player loading

  Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load

  Dean Herbert · 2018-03-08 20:28:55 +09:00
  94ed4ab01b
• Block player enter when a drag initiates from an overlaying container
  Dean Herbert · 2018-03-08 18:16:23 +09:00
  d3e91024a7
• Replace ConfigureBackgroundUpdate with OnEntering
  TocoToucan · 2018-03-08 11:35:00 +03:00
  2cb197d0c4
• Tidy things up to make more sense
  Dean Herbert · 2018-02-16 12:08:36 +09:00
  9760f30ce9
• Move all storyboard loading to Player itself
  TocoToucan · 2018-02-15 23:57:53 +03:00
  c57e8785e2
• Preview visual settings at the “loading” screen
  TocoToucan · 2018-02-09 00:06:24 +03:00
  a860dd7208
• Introduce PlayerBase class
  TocoToucan · 2018-02-08 23:28:42 +03:00
  d437c1d7ec
• Display visual settings overlay on PlayerLoader screen
  TocoToucan · 2018-01-26 23:29:54 +03:00
  ce4122b3c4
• Update licence headers
  Dean Herbert · 2018-01-05 20:21:19 +09:00
  37d393bca0
• Merge branch 'master' into better-notification-delays
  Dan Balasescu · 2017-12-27 23:26:57 +09:00
  3bfa6bd9fd
• Fix crash when starting play mode with no beatmap

  Closes #1767

  Dean Herbert · 2017-12-27 11:46:44 +09:00
  d17f6cb564
• Add a bindable Enabled flag to NotificationManager

  Also better handles delays before notifications are displayed.

  Dean Herbert · 2017-12-25 20:53:23 +09:00
  71a94d6b44
• Fix multiple order-of-execution issues with osu! logo

  Also sets better defaults.

  Dean Herbert · 2017-11-13 18:43:16 +09:00
  49a5af60e2
• Rename methods back
  Dean Herbert · 2017-11-09 17:38:20 +09:00
  4874371dbf
• Rename logo-related methods
  Dean Herbert · 2017-11-08 16:34:03 +09:00
  c2d4a213b1
• Fix quick retry looking bad
  Dean Herbert · 2017-11-02 21:52:01 +09:00
  9b2d41f4eb
• Make the osu! logo shared game-wide

  There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.

  Dean Herbert · 2017-11-02 20:38:02 +09:00
  b8b05fe8d2
• Use internal less

  Allows for more dynamic compilation to succeed. No reason for using internal here anyways.

  Dean Herbert · 2017-11-01 17:10:54 +09:00
  6fa02ce9bb
• Fix beatmap author being stored in two different places
  Dean Herbert · 2017-10-14 11:39:55 +09:00
  cd722e4abb
• Fix player loading.
  Damnae · 2017-09-15 09:06:27 +02:00
  010a6ec252
• Add missing return to PlayerLoader

  was being a bit too eager previously

  Dean Herbert · 2017-09-15 08:15:23 +09:00
  6ea22cc6c7
• Reshuffle namespaces
  Dean Herbert · 2017-07-26 13:22:46 +09:00
  fce580d717
• Rename EasingTypes to Easing
  Thomas Müller · 2017-07-22 20:53:53 +02:00
  e68675f970
• 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 Beatmap (bindable) non-nullable.
  Dean Herbert · 2017-07-19 15:16:53 +09:00
  d0dea33faa
• Get rid of raw AddDelay calls within osu.Game
  Thomas Müller · 2017-07-17 16:51:21 +03:00
  87bcd526f3
• ApplyDelay -> AddDelay
  Thomas Müller · 2017-07-16 17:47:29 +03:00
  032e9df67b
• Delay -> ApplyDelay; DelayReset -> ResetDelay
  Thomas Müller · 2017-07-16 14:06:46 +03:00
  71105bb9ee
• Update framework and fix compilation

  Most issues were related to BeginLoopedSequence usage and lack of
  "this." in front of transform helpers.

  Thomas Müller · 2017-07-14 19:18:12 +03:00
  a5e610a7ba
• Disable beatmap changes in specified screens
  Dean Herbert · 2017-07-11 18:39:10 +09:00
  9bbcc0526d