9694 Commits

This Branch

This Branch

All Branches

• Fix incorrect serialization condition
  smoogipoo · 2017-12-07 11:10:46 +09:00
  ea2c67ca5f
• Resharper cleanup
  smoogipoo · 2017-12-07 11:10:20 +09:00
  9597f9d46b
• Make maps with storyboards decode correctly with OsuJsonDecoder
  smoogipoo · 2017-12-07 10:37:51 +09:00
  0e3b001b13
• 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
• Add progress notification to migration
  smoogipoo · 2017-12-07 04:09:03 +09:00
  a8db3a9484
• Dont serialize hitobject sample properties copied from the control point
  smoogipoo · 2017-12-07 03:40:43 +09:00
  41b607c165
• Revert unintended change
  smoogipoo · 2017-12-07 03:39:43 +09:00
  9787788081
• Make TypedListConverter not reconstruct serializers
  smoogipoo · 2017-12-07 03:04:56 +09:00
  4232a54b32
• Add basic method to migrate beatmaps to the new JSON format
  smoogipoo · 2017-12-07 03:04:36 +09:00
  b6b26cfe25
• 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
• Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder
  smoogipoo · 2017-12-06 16:28:34 +09:00
  ed5f7e5353
• Assume that control points are already sequentially-ordered

  Fixes up deserializing.

  smoogipoo · 2017-12-06 16:24:09 +09:00
  f9e34dfa3d
• Add missing IsCompleted check to ensureValid
  Dean Herbert · 2017-12-06 16:20:49 +09:00
  04ae64e9fd
• Don't ignore RulesetId for now
  smoogipoo · 2017-12-06 14:14:07 +09:00
  887b81148d
• Add JsonIgnores to CommandTimelineGroup
  smoogipoo · 2017-12-06 13:48:44 +09:00
  44edb8724f
• 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 a few xmldocs
  smoogipoo · 2017-12-06 00:42:17 +09:00
  e199ee5225
• Add OsuJsonDecoder
  smoogipoo · 2017-12-06 00:38:12 +09:00
  d2dc7c8937
• Make Beatmap ISerializable and add more JsonIgnores
  smoogipoo · 2017-12-06 00:37:37 +09:00
  b584178e85
• 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
• remove unnecessary declaration + revert accidental formatting
  Aergwyn · 2017-12-04 12:11:28 +01:00
  12665fb8cf
• fix crash if any amount of maps were restored from main menu

  also fixes preview not playing if an entire set is restored

  Aergwyn · 2017-12-04 11:47:27 +01:00
  011223048b
• 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
• Merge branch 'master' of https://github.com/freezylemon/osu
  FreezyLemon · 2017-12-02 17:12:41 +01:00
  ee9fe64f4c
• 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