8895 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'origin/master' into editor-selection-tool
  smoogipoo · 2017-12-08 15:13:18 +09:00
  f41af191ed
• Merge pull request #1635 from awesomecuber/fix-sensitivityslider

  Fix SensitivitySlider keyboard control

  Dean Herbert · 2017-12-07 21:16:42 +09:00
  v2017.1208.0 5330ca1fa9
• Merge branch 'master' into fix-sensitivityslider
  Dan Balasescu · 2017-12-07 21:01:53 +09:00
  9e37a122e1
• Merge pull request #1603 from santerinogelainen/header-button-should-derive

  Fix beatmap overlay buttons not conforming to design

  Dean Herbert · 2017-12-07 20:56:15 +09:00
  805c61d032
• Move KeyboardStep assignment to ctor
  smoogipoo · 2017-12-07 20:53:28 +09:00
  d52b84df46
• Merge remote-tracking branch 'origin/master' into fix-sensitivityslider
  smoogipoo · 2017-12-07 20:49:48 +09:00
  46cd6fdb45
• Move drawable assignment to load, remove depth overrides
  Dean Herbert · 2017-12-07 20:44:55 +09:00
  24b3b10942
• Remove extra whitespace
  Dean Herbert · 2017-12-07 20:44:38 +09:00
  8c89354b36
• Merge branch 'master' into header-button-should-derive
  Dean Herbert · 2017-12-07 20:04:41 +09:00
  d36982b1d9
• Merge pull request #1663 from peppy/input-revamp

  Apply changes in line with framework input adjustments

  Dan Balasescu · 2017-12-07 18:47:40 +09:00
  fe2cc4daad
• Update framework
  Dean Herbert · 2017-12-07 18:37:54 +09:00
  13d0524542
• Merge remote-tracking branch 'upstream/master' into input-revamp
  Dean Herbert · 2017-12-07 18:07:26 +09:00
  c35c8263b9
• Merge pull request #1638 from Aergwyn/fix-beatmap-carousel-lag

  Fix lagging beatmap carousel because of storyboard-loading

  Dean Herbert · 2017-12-07 18:04:38 +09:00
  2a0b37e192
• Fix post-merge issue
  Dean Herbert · 2017-12-07 17:26:39 +09:00
  2a1a9b9f1f
• Merge branch 'master' into fix-beatmap-carousel-lag
  Dean Herbert · 2017-12-07 15:30:50 +09:00
  44ee11e75f
• Apply changes in line with framework input adjustments
  Dean Herbert · 2017-12-07 13:16:59 +09:00
  a78441bc5a
• Merge pull request #1660 from peppy/shader-precompile

  Add shader precompile step

  Dan Balasescu · 2017-12-07 04:25:15 +09:00
  de6d1cc647
• Merge branch 'master' into shader-precompile
  Dan Balasescu · 2017-12-07 04:15:24 +09:00
  9c4ca46786
• Merge pull request #1661 from peppy/fix-async-is-loaded

  Fix IsValueCreated method not checking whether the async task was completed

  Dan Balasescu · 2017-12-07 01:28:28 +09:00
  eaffd496f2
• Merge branch 'master' into fix-async-is-loaded
  Dan Balasescu · 2017-12-06 23:01:38 +09:00
  8e3cce798d
• Rename and comment for clarification
  Dean Herbert · 2017-12-06 21:47:48 +09:00
  34596b3368
• Add missing IsCompleted check to ensureValid
  Dean Herbert · 2017-12-06 16:20:49 +09:00
  04ae64e9fd
• Update framework
  Dean Herbert · 2017-12-06 11:59:53 +09:00
  988cc27f0e
• Fix IsValueCreated method not cecking whether the async task was completed

  Caused potential stutters for components that relied on this check.

  Dean Herbert · 2017-12-06 09:49:12 +09:00
  15ed3b4aac
• Add shader precompile step

  Resolves  https://github.com/ppy/osu-framework/issues/1180 in a way.

  Dean Herbert · 2017-12-05 17:41:47 +09:00
  fb6408257a
• Merge pull request #1658 from peppy/add-wait-for-restart

  Wait until track has restarted before continuing operation

  Dan Balasescu · 2017-12-05 14:24:25 +09:00
  abf5f3b390
• Wait until track has restarted before continuing operation

  I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.

  Dean Herbert · 2017-12-05 14:06:40 +09:00
  c1b607fed9
• Merge pull request #1649 from Aergwyn/fix-playlist-audio-issue

  Fix MusicController constantly trying to start a track

  Dean Herbert · 2017-12-05 01:11:13 +09:00
  v2017.1205.0 634700fae5
• Update framework once more
  Dean Herbert · 2017-12-05 01:00:06 +09:00
  b4641142a8
• Use Restart instead of Start
  Dean Herbert · 2017-12-04 21:40:26 +09:00
  caee6c1cf1
• Update framework
  Dean Herbert · 2017-12-04 20:32:50 +09:00
  7649a31157
• Tidy up events
  Dean Herbert · 2017-12-04 20:30:56 +09:00
  a83add8540
• Merge branch 'master' into fix-playlist-audio-issue
  Dean Herbert · 2017-12-04 19:24:03 +09:00
  22656233d3
• Merge pull request #1636 from smoogipoo/editor-composer

  Implement structure for Editor HitObject composition

  Dean Herbert · 2017-12-04 13:05:27 +09:00
  58777a9674
• Merge branch 'master' into editor-composer
  Dean Herbert · 2017-12-04 12:41:40 +09:00
  d75db5046b
• Merge pull request #1653 from smoogipoo/osuscreen-exit

  Add OnKeyDown override to OsuScreen

  Dean Herbert · 2017-12-04 11:51:36 +09:00
  23c0bec678
• Update framework
  smoogipoo · 2017-12-04 11:37:19 +09:00
  7cfe694a3f
• Add keydown override
  smoogipoo · 2017-12-04 11:30:25 +09:00
  5f9de399e4
• removed looping if only one song is in the list (temporarily)

  It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.

  Aergwyn · 2017-12-03 16:41:21 +01:00
  14096c90cc
• remove redundant expression
  Aergwyn · 2017-12-03 14:35:23 +01:00
  9d13bf3602
• use ?: expression
  Aergwyn · 2017-12-03 14:25:12 +01:00
  dfa7448716
• fix possible NullRef
  Aergwyn · 2017-12-03 14:15:08 +01:00
  0c9ebcd58c
• fixes MusicController constantly trying to start a track

  In Detail:
  It tried to start a track if the current one ended even if no BeatmapSets were present.
  Also if only one BeatmapSet is present if will loop by itself now.

  Aergwyn · 2017-12-03 14:03:43 +01:00
  a1dbd7916b
• Merge branch 'master' into editor-composer
  Dean Herbert · 2017-12-03 14:47:07 +09:00
  7957e55710
• Merge pull request #1640 from peppy/catch-hyperdash

  osu!catch hyperdash

  Dean Herbert · 2017-12-03 14:38:22 +09:00
  5a6f59bed0
• fix possible NullReference?

  AppVeyor pls?

  Aergwyn · 2017-12-02 17:04:42 +01:00
  ad8cd7eb5d
• fall back to .osu file for storyboard if no .osb file is present

  + CI fixes

  Aergwyn · 2017-12-02 16:05:39 +01:00
  cc76c58f5f
• expanded BeatmapDecoder tests, added StoryboardDecoder tests
  Aergwyn · 2017-12-02 15:28:00 +01:00
  2bbfe0dda1
• Remove unused using
  smoogipoo · 2017-12-02 20:35:47 +09:00
  2852337b04
• Apply suggested changes
  smoogipoo · 2017-12-02 20:31:15 +09:00
  cd20d6df16