6158 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into no-more-colourinfo
  Dean Herbert · 2017-07-25 10:14:48 +09:00
  3c7546e2c1
• Merge pull request #1054 from Nabile-Rahmani/drawableflag-ctor

  Less verbose DrawableFlag constructor

  Dean Herbert · 2017-07-25 09:51:07 +09:00
  4aba6f1903
• Merge branch 'master' into drawableflag-ctor
  Dean Herbert · 2017-07-25 09:46:27 +09:00
  b528568547
• Merge pull request #1055 from tgi74/master

  Fixed various exceptions when no beatmaps are imported

  Dean Herbert · 2017-07-25 09:37:30 +09:00
  1c501df83c
• Merge branch 'master' into master
  Dean Herbert · 2017-07-24 18:23:36 +09:00
  84f12c722f
• Merge pull request #1046 from EVAST9919/scrollable_carousel

  Make BeatmapCarousel inherit from OsuScrollContainer

  Dean Herbert · 2017-07-24 18:23:00 +09:00
  4dc4ff171a
• Merge branch 'master' into scrollable_carousel
  Dean Herbert · 2017-07-24 18:16:47 +09:00
  7fcd24ab69
• 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
• Merge branch 'master' into drawableflag-ctor
  Dean Herbert · 2017-07-24 16:46:20 +09:00
  038e47ceda
• Less verbose DrawableFlag constructor.
  Nabile Rahmani · 2017-07-24 09:25:49 +02:00
  c80f5c708a
• Merge pull request #1050 from benpigchu/playlist-beatmaplist-sync

  Update playlist when importing or deleting a beatmap

  Dean Herbert · 2017-07-24 15:13:32 +09:00
  9bb404b799
• Merge branch 'master' into playlist-beatmaplist-sync
  Dean Herbert · 2017-07-24 14:12:04 +09:00
  750d96be8f
• No need to dispose/unbind the delegates
  Ben Pig Chu · 2017-07-24 13:10:51 +08:00
  950c55d6d0
• Merge branch 'master' into no-more-colourinfo
  Thomas Müller · 2017-07-23 13:10:28 +02:00
  197f57c129
• 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
• Update playlist when adding or removing beatmap set
  Ben Pig Chu · 2017-07-23 14:21:10 +08:00
  76edcb4a67
• Merge pull request #1052 from Tom94/easing

  Rename EasingTypes to Easing

  Dean Herbert · 2017-07-23 14:30:50 +09:00
  65c26f9b24
• Update framework
  Dean Herbert · 2017-07-23 13:47:48 +09:00
  436e155e23
• 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
• 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 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