6079 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-empty-carousel
  Thomas Müller · 2017-07-20 21:04:45 +02:00
  4e33efd41f
• Merge pull request #1031 from peppy/always-load-storyboard

  Remove FullyLoaded logic

  Thomas Müller · 2017-07-20 21:04:24 +02:00
  119b4dd04c
• Merge branch 'master' into always-load-storyboard
  Thomas Müller · 2017-07-20 20:54:16 +02:00
  ed6478be8b
• Merge pull request #1033 from peppy/fix-working-beatmap-double-load

  Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect

  Thomas Müller · 2017-07-20 20:53:53 +02:00
  9dc3987834
• 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 pull request #1022 from jorolf/user-profile-fixes

  User profile improvements

  Dean Herbert · 2017-07-20 19:40:26 +09:00
  8bc2df8749
• Update framework
  Dean Herbert · 2017-07-20 19:32:17 +09:00
  b25188895b
• Merge remote-tracking branch 'upstream/master' into user-profile-fixes
  Dean Herbert · 2017-07-20 19:32:00 +09:00
  cb3402098a
• Merge pull request #1037 from peppy/no-set-exclusive

  Remove usage of SetExclusive

  Dean Herbert · 2017-07-20 19:29:28 +09:00
  bb167a9f82
• Merge remote-tracking branch 'upstream/master' into user-profile-fixes
  Dean Herbert · 2017-07-20 19:15:21 +09:00
  781d76d094
• Merge branch 'master' into no-set-exclusive
  Thomas Müller · 2017-07-20 12:11:32 +02:00
  8108f3e78d
• Merge pull request #1038 from peppy/fix-songselect-footer-light

  Fix footer button light fading incorrectly

  Thomas Müller · 2017-07-20 12:10:38 +02:00
  a104754e64
• 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
• Remove FullyLoaded logic

  Always parse storyboards for now.
  
  Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.

  Dean Herbert · 2017-07-20 11:01:50 +09:00
  d6968ca09c
• Merge pull request #1029 from smoogipooo/fix-beatmap-null

  Fix Player crashing due to null BeatmapInfo (now unused).

  Dean Herbert · 2017-07-20 09:40:18 +09:00
  8417e59de3
• Merge branch 'master' into fix-beatmap-null
  Dean Herbert · 2017-07-20 09:33:14 +09:00
  b00fc857dd
• Don't rely on BeatmapSetInfo being present
  Dean Herbert · 2017-07-20 09:23:11 +09:00
  8d727b898f
• Fix TestWorkingBeatmap broken by attempting to load storyboard
  Dean Herbert · 2017-07-20 09:22:39 +09:00
  d69470f2ae
• Merge pull request #937 from MrTheMake/intro-track-start-fix

  Don't start a beatmap's track until the intro is done playing

  Dean Herbert · 2017-07-20 09:05:15 +09:00
  a3329fef37
• Don't start a beatmap's track until the intro is done playing
  MrTheMake · 2017-07-20 01:57:46 +02:00
  fd518e2294
• Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes
  Jorolf · 2017-07-20 01:08:42 +02:00
  bac8693c81
• remove using
  Jorolf · 2017-07-20 01:08:26 +02:00
  e0fb2563b5
• Merge branch 'master' into user-profile-fixes
  jorolf · 2017-07-20 01:06:36 +02:00
  c2a2f77210
• add link to user page
  Jorolf · 2017-07-20 01:03:00 +02:00
  b016103894
• Fix Player crashing due to null BeatmapInfo (now unused).
  smoogipooo · 2017-07-20 01:27:27 +09:30
  d75e439f94
• Merge pull request #1027 from peppy/non-null-beatmap

  Make Beatmap non-nullable

  Dan Balasescu · 2017-07-19 22:05:24 +09:30
  a7d4a3d473
• Fix remaining test case issues
  Dean Herbert · 2017-07-19 19:10:04 +09:00
  38431f8555
• Fix broken test case
  Dean Herbert · 2017-07-19 18:48:27 +09:00
  8ce71ef235
• Merge branch 'master' into non-null-beatmap
  Dean Herbert · 2017-07-19 18:32:42 +09:00
  da92fccdb0
• Set zero-difficulty values local to the dummy beatmap
  Dean Herbert · 2017-07-19 18:32:11 +09:00
  d7dddec328
• Update framework
  Dean Herbert · 2017-07-19 18:24:03 +09:00
  8764d88f0f
• Forward action in saner way
  Dean Herbert · 2017-07-19 18:22:46 +09:00
  2c5019ff7c
• Merge branch 'master' into user-profile-fixes
  Dean Herbert · 2017-07-19 18:15:38 +09:00
  b6b7ae47db
• Reference system
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  0b53f1a7e3
• Simplify comparator
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  a01209cfe0
• Make DefaultBeatmap private get.
  Dean Herbert · 2017-07-19 18:09:59 +09:00
  35157ca6b8
• Make link text not suck
  Dean Herbert · 2017-07-19 17:54:04 +09:00
  2eccb3822a
• Merge pull request #1026 from peppy/beatmap-delete-fixes

  Fix crashes related to deleting/importing beatmaps

  Dan Balasescu · 2017-07-19 17:46:49 +09:30
  285790bae0
• Merge branch 'master' into beatmap-delete-fixes
  Dan Balasescu · 2017-07-19 17:34:12 +09:30
  42af26a5a5
• Merge pull request #1028 from peppy/fix-flashy-sides

  Fix main menu flashy sides moving too much

  Dan Balasescu · 2017-07-19 17:26:26 +09:30
  11eecdd281
• Gratify CI
  Dean Herbert · 2017-07-19 16:34:18 +09:00
  c34856922c
• Ensure side flashes are not visible during moving transitions
  Dean Herbert · 2017-07-19 16:13:01 +09:00
  2a2f4e2a8b