6137 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into easing
  Dean Herbert · 2017-07-23 13:46:35 +09:00
  831bd24b00
• Merge pull request #1019 from Tom94/better-transforms

  Improve transforms and use new LINQ-like syntax

  Dean Herbert · 2017-07-23 13:45:52 +09:00
  660afb40b0
• Supress compiler warning

  I don't think this is a sustainable solution if we start doing this in more places.

  Dean Herbert · 2017-07-23 11:34:09 +09:00
  c6250e1da5
• Rename EasingTypes to Easing
  Thomas Müller · 2017-07-22 20:53:53 +02:00
  e68675f970
• Update framework
  Thomas Müller · 2017-07-22 13:49:41 +02:00
  c08cb43b9c
• Merge branch 'better-transforms' of github.com:Tom94/osu into prevent-dependency-pollution
  Thomas Müller · 2017-07-22 12:16:58 +02:00
  a7c6decd42
• Fix broken test case
  Thomas Müller · 2017-07-22 12:16:46 +02:00
  96675965d8
• Don't obtain DependencyContainer via DI
  Thomas Müller · 2017-07-22 11:43:52 +02:00
  7e895f66e0
• Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
  Thomas Müller · 2017-07-22 11:34:27 +02:00
  750fc0db0e
• Address CI concerns and update framework
  Thomas Müller · 2017-07-22 11:15:45 +02:00
  598b3f051e
• Don't obtain DependencyContainer via DI
  Thomas Müller · 2017-07-22 11:09:13 +02:00
  dae0f61b2b
• Update framework
  Thomas Müller · 2017-07-22 11:06:07 +02:00
  a4dfe3f1fa
• Merge branch 'master' of github.com:ppy/osu into prevent-dependency-pollution
  Thomas Müller · 2017-07-22 10:56:28 +02:00
  95684f7d40
• Merge branch 'master' into better-transforms
  Thomas Müller · 2017-07-22 10:50:58 +02:00
  e36b65bfe0
• Merge pull request #1051 from peppy/fix-di-chatline-regression

  Allow ChatLines to exist without UserProfileOverlay

  Thomas Müller · 2017-07-22 10:50:41 +02:00
  fd4cd5edd1
• Minor refactor of TestCaseBeatSyncedContainer
  Thomas Müller · 2017-07-22 10:48:15 +02:00
  4755529d43
• Allow ChatLines to exist without UserProfileOverlay

  Fixes testcases failing when logged in.

  Dean Herbert · 2017-07-22 17:18:20 +09:00
  7549d3a2c4
• Update dependency caching according to framework
  Thomas Müller · 2017-07-21 19:03:43 +02:00
  e469a114a6
• Update framework
  Thomas Müller · 2017-07-21 18:23:01 +02:00
  0f2bcb2904
• Update framework
  Thomas Müller · 2017-07-21 17:24:09 +02:00
  a7dc8a892b
• 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 pull request #1041 from peppy/fix-carousel-debounce-race

  Fix carousel filter debounce causing a race condition

  Dean Herbert · 2017-07-21 17:57:47 +09:00
  v2017.721.0 d344452e9b
• Merge branch 'master' into fix-carousel-debounce-race
  Dean Herbert · 2017-07-21 17:44:04 +09:00
  9a33e77d63
• Merge pull request #1042 from peppy/fix-selection-changing

  Fix selection changing on entering song select

  Dean Herbert · 2017-07-21 17:43:57 +09:00
  ae2923f074
• Merge branch 'master' into fix-selection-changing
  Thomas Müller · 2017-07-21 10:22:11 +02:00
  3a086534f8
• Merge pull request #1043 from peppy/fix-songprogress-endtime

  Fix incorrect end time calculation in SongProgressGraph

  Thomas Müller · 2017-07-21 10:22:01 +02:00
  c9cdb9c865
• Make method to flush filter requests
  Dean Herbert · 2017-07-21 17:20:52 +09:00
  12b6b80d5c
• Merge branch 'master' into fix-songprogress-endtime
  Dean Herbert · 2017-07-21 16:46:41 +09:00
  bf254bf5cf
• Merge pull request #1040 from MrTheMake/previewtime-seeking

  Fix double-seek in main menu song playback

  Dean Herbert · 2017-07-21 15:11:41 +09:00
  db35b0ab31
• Merge branch 'master' into previewtime-seeking
  Dean Herbert · 2017-07-21 15:06:18 +09:00
  6bdf6bb675
• Fix incorrect end time calculation in SongProgressGraph
  Dean Herbert · 2017-07-21 10:10:25 +09:00
  f7b64a458a
• 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 pull request #1035 from peppy/fix-empty-carousel

  Fix selection not being reset correct when changing between rulesets

  Thomas Müller · 2017-07-20 21:50:19 +02:00
  31ac083408
• Merge branch 'master' into fix-empty-carousel
  Thomas Müller · 2017-07-20 21:15:58 +02:00
  e84d8cc020
• Merge pull request #1032 from peppy/fix-beatmap-select-race

  Fix hitting down and enter at song select causing a hard-crash

  Thomas Müller · 2017-07-20 21:15:48 +02:00
  e98dd62e5c
• 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 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
• Small optimization to the main menu intro seeking.
  MrTheMake · 2017-07-20 17:15:39 +02:00
  22f3e97241
• 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