8872 Commits

This Branch

This Branch

All Branches

• 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
• 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
• Use OsuColour for radio buttons
  smoogipoo · 2017-12-02 20:30:18 +09:00
  c14d68e685
• Remove PlayfieldOverlay
  smoogipoo · 2017-12-02 20:24:10 +09:00
  a80059032c
• Merge branch 'master' into catch-hyperdash
  Dan Balasescu · 2017-12-02 20:18:21 +09:00
  66f3cc747d
• Remove PlayfieldUnderlay for now
  smoogipoo · 2017-12-02 19:53:20 +09:00
  5a7c4772bd
• removed unnecessary using
  Aergwyn · 2017-12-01 22:15:10 +01:00
  e07b85311b
• reverted split at Decoder, moved logic down

  I'm done experimenting, sorry
  - `Decoder` only returns a "Beatmap"`Decoder` now
  - "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
  - moved parse methods down in the hierarchy where I forgot to do that
  - renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`

  Aergwyn · 2017-12-01 22:05:01 +01:00
  c466296b14
• Split retrieving of beatmap and storyboard decoder

  Storyboard works again. Not satisfied with the solution though.

  Aergwyn · 2017-12-01 19:11:52 +01:00
  a49f3479a2
• Merge pull request #1643 from gtensha/master

  Fix filename casing to compile on Linux

  Dean Herbert · 2017-12-02 02:21:49 +09:00
  v2017.1202.0 6faa0f62b3
• Fix filename casing to compile on Linux
  gtensha · 2017-12-01 18:10:39 +01:00
  de94082b1e
• CI adjustments

  - removing unnecessary `using`s
  - name Fields/Methods according to rules
  - removing unnecessary initializations

  Aergwyn · 2017-12-01 17:58:11 +01:00
  db50ad794e
• restructured OsuLegacyDecoder into LegacyDecoder

  Beatmap works, Storyboard not...

  Aergwyn · 2017-12-01 17:43:33 +01:00
  806c0e3b26
• Merge pull request #1630 from Aergwyn/fix-set-hidden-crash

  Fix crash when all beatmaps in a set are hidden

  Dean Herbert · 2017-12-01 23:48:30 +09:00
  f547b3bde5
• Merge branch 'master' into fix-set-hidden-crash
  Dean Herbert · 2017-12-01 23:35:48 +09:00
  70b29b8b62