1563 Commits

• Merge branch 'master' into storyboard_integration
  Dean Herbert · 2017-09-26 20:19:26 +08:00
  7c70d3d2cb
• Simplify null check
  smoogipoo · 2017-09-26 20:11:45 +09:00
  10dbd68c1e
• Bind to the screen Beatmap instead of the game-wide Beatmap
  smoogipoo · 2017-09-26 17:58:40 +09:00
  c578509a20
• Add missing license headers
  smoogipoo · 2017-09-26 15:58:30 +09:00
  3937ebdc3d
• Merge branch 'master' into editor-timing-timeline
  Dan Balasescu · 2017-09-26 15:54:01 +09:00
  b8b54e95a5
• A bit of cleanup
  smoogipoo · 2017-09-26 15:51:45 +09:00
  10e5fe40b2
• Re-namespace SummaryTimeline
  smoogipoo · 2017-09-26 15:45:27 +09:00
  5953c1084e
• Implement MarkerPart for the marker
  smoogipoo · 2017-09-26 15:45:08 +09:00
  85cb541fef
• Re-namespace and split out timeline parts from the SummaryTimeline
  smoogipoo · 2017-09-26 15:44:40 +09:00
  a1f88a17b1
• Avoid nullrefs when data is not present
  Dean Herbert · 2017-09-25 23:35:02 +08:00
  f129902ee0
• Apply beatmap settings when creating the DrawableStoryboard.
  Damnae · 2017-09-25 11:03:57 +02:00
  2d4616fd43
• Fix bookmarks not working

  We should be dealing with the array in every situation, with the exception of the database.

  smoogipoo · 2017-09-25 17:46:51 +09:00
  d787c740fa
• Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
  Damnae · 2017-09-25 10:40:22 +02:00
  0996867112
• Merge remote-tracking branch 'origin/master' into editor-timing-timeline

  # Conflicts:
  #	osu-framework

  smoogipoo · 2017-09-25 17:20:55 +09:00
  7fb8008e44
• Merge branch 'master' into icons_jumping_fix
  Dean Herbert · 2017-09-25 12:07:25 +08:00
  0aebfdd578
• Fix overlay toggling in song select.
  Huo Yaoyuan · 2017-09-23 19:47:23 +08:00
  442259d9e0
• Remove redundant usings
  smoogipooo · 2017-09-20 18:40:41 +09:00
  e65a17ad96
• Improve layout of bottom bar in the Editor
  smoogipooo · 2017-09-20 18:16:03 +09:00
  7168e8fd99
• Add SummaryTimeline to Editor
  smoogipooo · 2017-09-20 17:09:38 +09:00
  7588f1b6ca
• Move SummaryTimeline into /Edit/Components/SummaryTimeline
  smoogipooo · 2017-09-20 16:59:03 +09:00
  f9568619e7
• Ensure only one dialog is being displayed by the SongSelect footer at a time

  Fixes #1208

  Dean Herbert · 2017-09-20 14:32:15 +09:00
  120446e4a7
• Merge branch 'master' into storyboard_integration
  Damnae · 2017-09-19 17:36:29 +02:00
  fcaabf7fdf
• Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix
  EVAST9919 · 2017-09-19 17:08:32 +03:00
  1de8bca7f6
• And then everything became one
  Dean Herbert · 2017-09-19 16:06:58 +09:00
  6d3d485565
• Merge branch 'master' into scores-lookup-requires-id
  Dan Balasescu · 2017-09-16 08:43:59 +09:00
  02ccea1c4e
• Display a non-parallax background at the appropriate size when storyboards do not replace it.
  Damnae · 2017-09-15 14:31:54 +02:00
  757a159516
• Load the storyboard asynchronously if it wasn't loaded with the beatmap.
  Damnae · 2017-09-15 11:58:37 +02:00
  f5368505ab
• Don't create drawables for hidden storyboards.
  Damnae · 2017-09-15 11:58:37 +02:00
  4a15762139
• Better property name.
  Damnae · 2017-09-15 11:58:31 +02:00
  c8cdf6787e
• Unbind events affecting the background after gameplay has ended.
  Damnae · 2017-09-15 09:16:56 +02:00
  7c3ce7e830
• Add a setting to hide storyboards.
  Damnae · 2017-09-15 09:16:56 +02:00
  cb8029af9e
• Integrate storyboards with gameplay.
  Damnae · 2017-09-15 09:16:56 +02:00
  ddaf28d7f6
• Fix player loading.
  Damnae · 2017-09-15 09:06:27 +02:00
  010a6ec252
• Fix icons in main button system jumps on one side for a long time
  EVAST9919 · 2017-09-15 09:24:31 +03:00
  e7c9ad245e
• Ensure an OnlineBeatmapID is present before attempting API requests
  Dean Herbert · 2017-09-15 12:44:48 +09:00
  b72921b30e
• Add missing return to PlayerLoader

  was being a bit too eager previously

  Dean Herbert · 2017-09-15 08:15:23 +09:00
  6ea22cc6c7
• Remove global OsuContextMenuContainer
  Dean Herbert · 2017-09-14 15:41:32 +09:00
  396a56ddf4
• Remove max
  Dean Herbert · 2017-09-14 13:47:25 +09:00
  d330b39db4
• Fix incorrect exception
  Dean Herbert · 2017-09-14 13:13:54 +09:00
  4f09f30b7a
• Update code to support new inspectcode analysis rules
  Dean Herbert · 2017-09-14 12:58:32 +09:00
  b1145272d1
• Merge branch 'master' into scoring-revamp
  Dean Herbert · 2017-09-13 20:47:14 +09:00
  b78c516b74
• Update all dependencies in line with framework
  Dean Herbert · 2017-09-13 20:25:40 +09:00
  fb7740a3ab
• Move AllObjectsJudged into ScoreProcessor as AllJudged

  Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.

  smoogipooo · 2017-09-12 22:01:08 +09:00
  2e0218f388
• Fix osu! logo triangles going super fast when the track is paused
  Shane Woolcock · 2017-09-11 19:16:44 +09:30
  262aea8b6b
• Merge remote-tracking branch 'origin/master' into blending-equations

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-09-11 15:02:12 +09:00
  58c875bdca
• Merge branch 'master' into beatmap-details-rewrite
  Dean Herbert · 2017-09-11 12:30:32 +09:00
  adba5b5ba6
• Add nullref check in KeyCounterCollection's Add method
  Dean Herbert · 2017-09-11 11:41:09 +09:00
  eedfbdc0e8
• Merge remote-tracking branch 'origin/master' into blending-equations

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-09-11 02:42:23 +09:00
  cde22865b9
• Merge branch 'master' into beatmap-details-rewrite
  Dean Herbert · 2017-09-10 11:26:00 +09:00
  6d33e39c5e
• CI fixes.
  DrabWeb · 2017-09-08 14:25:41 -03:00
  d95940ed5e