26282 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-cursor-cs-scaling
  Dan Balasescu · 2020-02-14 18:11:18 +09:00
  745de8ad7f
• Merge pull request #7807 from peppy/fix-timeline-seek-while-playing

  Fix not being able to seek using scroll wheel in timeline while playing track

  Dan Balasescu · 2020-02-14 18:07:44 +09:00
  dca6162d9e
• Merge branch 'master' into fix-timeline-seek-while-playing
  Dan Balasescu · 2020-02-14 17:02:34 +09:00
  6aab9b7a08
• Merge pull request #7546 from Game4all/online-container

  Add a container type to easily hide online content when not online

  Dean Herbert · 2020-02-14 16:00:17 +09:00
  4fbf85505c
• Fix bindable being created far too late in construction
  Dean Herbert · 2020-02-14 15:59:59 +09:00
  9cbb37b682
• Move drawable load to asynchronous context
  Dean Herbert · 2020-02-14 15:41:46 +09:00
  a75715607b
• Final tidy-up pass
  Dean Herbert · 2020-02-14 15:38:47 +09:00
  720ceca78a
• API can't be null on load
  Dean Herbert · 2020-02-14 15:36:06 +09:00
  edf9cfc863
• Move LoadComplete up in method
  Dean Herbert · 2020-02-14 15:35:39 +09:00
  6f1cecd86f
• Add missing xmldoc
  Dean Herbert · 2020-02-14 15:34:46 +09:00
  7e6c194d4a
• Remove unnecessary content private storage
  Dean Herbert · 2020-02-14 15:29:50 +09:00
  4d5abab2ee
• Move nested class to bottom of file
  Dean Herbert · 2020-02-14 15:27:39 +09:00
  b86b5e9adb
• Fix test text not being centered
  Dean Herbert · 2020-02-14 15:27:09 +09:00
  c34f1f40ea
• Fix tests potentially failing due to timing issues
  Dean Herbert · 2020-02-14 15:26:55 +09:00
  aa7efe6141
• Merge branch 'master' into online-container
  Dean Herbert · 2020-02-14 15:18:27 +09:00
  76cfe1f42c
• Fix missing dependency in ZoomableScrollContainer test
  Dean Herbert · 2020-02-14 14:41:55 +09:00
  0e439e3a70
• Fix osu! gameplay cursor not adjusting to mod/convert circle size changes
  Dean Herbert · 2020-02-14 14:30:15 +09:00
  884a5fbad4
• Merge branch 'master' into fix-timeline-seek-while-playing
  Dan Balasescu · 2020-02-14 13:04:38 +09:00
  60d796ae3f
• Merge pull request #7827 from turbedi/span_fromHex

  Use Span for OsuColour.FromHex

  Dan Balasescu · 2020-02-14 12:44:11 +09:00
  7fdc8cc7c1
• Merge branch 'master' into span_fromHex
  Dan Balasescu · 2020-02-14 12:09:34 +09:00
  f64f934204
• Merge pull request #7800 from peppy/fix-editor-time-change-display

  Fix editor hit objects displaying incorrectly after StartTime change

  Dan Balasescu · 2020-02-14 11:33:42 +09:00
  a9bfe9f7f3
• Merge pull request #7805 from peppy/update-placement-more-often

  Update placement blueprint's position more often

  Dan Balasescu · 2020-02-14 11:33:03 +09:00
  e5c706a97d
• Use Span for OsuColour.FromHex
  Berkan Diler · 2020-02-14 03:19:25 +01:00
  50899ddccb
• Add back default content fade transitions
  Lucas A · 2020-02-13 21:40:25 +01:00
  049b0d93d1
• Apply review suggestions.
  Lucas A · 2020-02-13 20:08:14 +01:00
  dac0148c94
• Merge branch 'master' into fix-editor-time-change-display
  Dean Herbert · 2020-02-13 23:55:52 +09:00
  5b3f0bbb0a
• Merge branch 'master' into update-placement-more-often
  Dean Herbert · 2020-02-13 23:55:18 +09:00
  d7c71cd0c1
• Merge pull request #7814 from smoogipoo/remove-current-item

  Remove the concept of a "current" item from multiplayer rooms

  Dean Herbert · 2020-02-13 23:54:32 +09:00
  c1924535ff
• Remove unused using
  Dean Herbert · 2020-02-13 22:28:37 +09:00
  e181a95c85
• Merge branch 'master' into remove-current-item
  Dean Herbert · 2020-02-13 21:41:23 +09:00
  4a04b434a9
• Merge pull request #7815 from smoogipoo/participants-bindable

  Make room participants into a bindable list

  Dean Herbert · 2020-02-13 20:35:38 +09:00
  1e58670930
• Merge branch 'master' into remove-current-item
  Dean Herbert · 2020-02-13 19:34:15 +09:00
  b9a296d3f9
• Merge branch 'master' into participants-bindable
  Dean Herbert · 2020-02-13 19:31:50 +09:00
  28ca1a5bcc
• Merge pull request #7816 from smoogipoo/missing-nullcheck

  Add missing null-allowance to leaderboard

  Dean Herbert · 2020-02-13 19:30:43 +09:00
  d633396878
• Merge pull request #7813 from peppy/update-framework

  Update framework

  Dean Herbert · 2020-02-13 19:29:59 +09:00
  80ead1c979
• Add missing null-allowance
  smoogipoo · 2020-02-13 19:04:23 +09:00
  bc1c4f6b58
• Make room participants into a bindable list
  smoogipoo · 2020-02-13 18:59:15 +09:00
  bce9c8f3f3
• Merge pull request #7784 from smoogipoo/fix-beatmap-disposal

  Fix disposal-related errors by making WorkingBeatmap non-disposable

  Dean Herbert · 2020-02-13 18:52:47 +09:00
  e022352812
• Merge pull request #7812 from smoogipoo/playlist-bindables

  Make playlist beatmap and ruleset into bindables

  Dean Herbert · 2020-02-13 18:51:42 +09:00
  49a1725749
• Remove "current" multiplayer room item
  smoogipoo · 2020-02-13 18:48:28 +09:00
  75bef15583
• Merge branch 'master' into update-placement-more-often
  Dan Balasescu · 2020-02-13 18:43:27 +09:00
  4b7a053544
• Update framework
  Dean Herbert · 2020-02-13 18:35:31 +09:00
  be2d1c6b43
• Merge pull request #7806 from peppy/timeline-zoom-button-repeat

  Add mouse down repeat support to timeline zoom buttons

  Dean Herbert · 2020-02-13 18:35:11 +09:00
  d6263adb7b
• Merge pull request #7811 from smoogipoo/mod-expansion-types

  Improve extensibility of mod display expansion

  Dean Herbert · 2020-02-13 18:34:46 +09:00
  24e7c3e11b
• Make playlist beatmap and ruleset into bindables
  smoogipoo · 2020-02-13 18:12:47 +09:00
  91edadfe9d
• Improve extensibility of mod display expansion
  smoogipoo · 2020-02-13 18:05:53 +09:00
  d4f14e552a
• Merge branch 'master' into timeline-zoom-button-repeat
  Dan Balasescu · 2020-02-13 18:04:36 +09:00
  c384e3cfc2
• Merge pull request #7803 from peppy/fix-blueprint-outside-container

  Fix blueprint showing even when mouse outside of container

  Dan Balasescu · 2020-02-13 17:54:28 +09:00
  08d0a08d54
• Merge branch 'master' into fix-blueprint-outside-container
  Dan Balasescu · 2020-02-13 17:54:20 +09:00
  97a03729b2
• Merge pull request #7808 from peppy/disable-interaction-progress-bar

  Disallow seeking on osu!direct download progress bars

  Dan Balasescu · 2020-02-13 17:47:07 +09:00
  cb46d34dd7