739 Commits

• Merge branch 'master' into editor-new-beatmap
  Dean Herbert · 2020-09-07 18:42:51 +09:00
  4792b44911
• Merge branch 'master' into editor-new-beatmap
  Dean Herbert · 2020-09-04 13:11:59 +09:00
  1f2f21e07a
• Fix merge conflicts.
  Lucas A · 2020-09-03 21:56:47 +02:00
  82e314da59
• Merge pull request #10043 from peppy/better-outro-music-fade

  Improve music fade on game exit

  Dan Balasescu · 2020-09-03 14:24:46 +09:00
  cf89a6e1a4
• Merge branch 'master' into game-overlay-activation-mode
  Dan Balasescu · 2020-09-03 13:34:22 +09:00
  84b3604192
• Start with a fresh beatmap when entering editor from main menu
  Dean Herbert · 2020-09-03 13:20:23 +09:00
  e032844570
• Add safeties to ensure the current track doesn't loop or change
  Dean Herbert · 2020-09-03 13:15:23 +09:00
  2f42c57f4b
• Improve game exit music fade
  Dean Herbert · 2020-09-03 13:15:23 +09:00
  547c8090e5
• Add smooth fading between audio tracks on transition
  Dean Herbert · 2020-09-02 20:04:56 +09:00
  6a765d2d76
• Merge branch 'master' into beatmap-track-rework
  Dan Balasescu · 2020-09-01 16:06:38 +09:00
  f08e7828da
• Add back disabling of overlays on exiting game.
  Lucas A · 2020-08-29 19:34:53 +02:00
  8de7744b52
• Make game bindable immutable.
  Lucas A · 2020-08-29 19:34:53 +02:00
  ad223bc460
• Update osu.Game/Screens/Menu/IntroSequence.cs

  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Poliwrath · 2020-08-26 12:52:39 -04:00
  edc15c965c
• Revert some usages based on review feedback
  Dean Herbert · 2020-08-26 23:28:58 +09:00
  f65991f31f
• fix lingering small ring in circles! intro
  Poliwrath · 2020-08-26 02:49:55 -04:00
  c50e495e03
• Remove stray call to LoadTrack that was forgotten
  Dean Herbert · 2020-08-21 18:52:53 +09:00
  f63d1ba612
• Fix intro welcome playing double due to missing conditional
  Dean Herbert · 2020-08-21 18:33:24 +09:00
  1edafc39ba
• Avoid beatmap load call in IntroScreen
  Dean Herbert · 2020-08-21 15:50:14 +09:00
  0ae460fb8f
• Add explicit LoadTrack method
  Dean Herbert · 2020-08-17 15:38:16 +09:00
  d9debef156
• Merge branch 'master' into beatmap-track-rework
  Dean Herbert · 2020-08-17 15:00:29 +09:00
  0c4aefb15e
• Fix a couple of new Resharper inspections
  Dean Herbert · 2020-08-16 23:11:29 +09:00
  5d433c0b05
• Rename resolved variable in MainMenu
  Dean Herbert · 2020-08-16 23:04:54 +09:00
  a6708c4286
• Update with further framework changes
  smoogipoo · 2020-08-12 01:50:18 +09:00
  c0031955c9
• More cleanups
  smoogipoo · 2020-08-12 00:48:38 +09:00
  070d71ec27
• Make MusicController non-nullable
  smoogipoo · 2020-08-11 12:40:58 +09:00
  7d35893ecd
• Rename method
  smoogipoo · 2020-08-07 22:31:41 +09:00
  e87f50f74f
• Update inspections
  smoogipoo · 2020-08-07 20:51:56 +09:00
  5002d69f69
• Ensure CurrentTrack is never null
  smoogipoo · 2020-08-07 19:43:16 +09:00
  61b632516e
• Refactor MainMenu
  smoogipoo · 2020-08-06 18:54:14 +09:00
  f8279dab32
• Fix intros playing incorrectly
  smoogipoo · 2020-08-06 18:54:08 +09:00
  ef689d943a
• Expose track from MusicController
  smoogipoo · 2020-08-06 16:24:14 +09:00
  5c05fe3988
• Move track to MusicController, compiles
  smoogipoo · 2020-08-06 16:24:14 +09:00
  6e42b8219c
• Refactor overlay activation logic and reword tip.
  Lucas A · 2020-08-05 11:21:09 +02:00
  71895964f4
• Merge branch 'master' into osu-logo-no-update-transforms
  Dan Balasescu · 2020-07-28 15:36:37 +09:00
  33330701e1
• Adjust damp base component to provide ample tweening
  Dean Herbert · 2020-07-27 15:10:32 +09:00
  5b724d9659
• rename classes
  jorolf · 2020-07-22 22:10:59 +02:00
  50f72ac9cb
• Remove remaining per-Update transform in OsuLogo to reduce allocations
  Dean Herbert · 2020-07-18 11:44:18 +09:00
  20096f9aea
• simplify transform
  jorolf · 2020-07-15 12:40:46 +02:00
  87f7d8744d
• Merge branch 'master' into logo-shader
  Dean Herbert · 2020-07-15 19:06:35 +09:00
  fe68e8276d
• Tidy up colour and variable usage
  Dean Herbert · 2020-07-15 19:03:59 +09:00
  675544ec2f
• Fix behavioural regression by splitting methods out
  Dean Herbert · 2020-07-10 18:03:56 +09:00
  1760cc2427
• Ensure music starts when returning to lounge or main menu
  Dean Herbert · 2020-07-10 17:20:27 +09:00
  44fdb5b82e
• Replace poo icon at disclaimer screen
  Dean Herbert · 2020-07-09 12:31:20 +09:00
  efdf179906
• Minor reshuffling / recolouring
  Dean Herbert · 2020-07-06 23:51:16 +09:00
  3f3bfb1ffb
• Move dialog classes to own file
  Dean Herbert · 2020-07-06 23:44:26 +09:00
  a650a5ec83
• Move start fresh button above
  smoogipoo · 2020-07-06 22:41:51 +09:00
  ddac511c8c
• Apply suggestions from code review

  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dan Balasescu · 2020-07-06 22:40:45 +09:00
  8f792603ee
• Add dialog for storage options
  smoogipoo · 2020-07-06 22:03:09 +09:00
  1effe71ec2
• change textures
  jorolf · 2020-07-04 19:06:26 +02:00
  52b313f290
• Expose MainMenu Track as internal get private set
  Shivam · 2020-06-29 02:10:40 +02:00
  444504f2b9