24217 Commits

This Branch

This Branch

All Branches

• Add the ability to create settings UI components from a class w… (#7081)

  Add the ability to create settings UI components from a class with exposed drawables

  Dean Herbert · 2019-12-10 19:12:58 +09:00
  f3ec98d85f
• Merge branch 'master' into settings-source
  Dean Herbert · 2019-12-10 18:49:41 +09:00
  f6c0b5c44a
• Fix SettingsItem bindable logic (#7080)

  Fix SettingsItem bindable logic

  Dean Herbert · 2019-12-10 18:49:16 +09:00
  33f946da3b
• Merge branch 'master' into fix-settings-bindable-logic
  Dean Herbert · 2019-12-10 18:30:27 +09:00
  efc3b7fc9f
• Merge pull request #7139 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-12-10 18:30:05 +09:00
  491c9aaedb
• Remove unused class
  Dean Herbert · 2019-12-10 18:08:51 +09:00
  f593caf0ea
• Fix bindable usage
  Dean Herbert · 2019-12-10 18:08:24 +09:00
  55c938e5da
• Update framework
  Dean Herbert · 2019-12-10 17:49:42 +09:00
  65f2d1f875
• Update bindable types in line with framework
  Dean Herbert · 2019-12-10 16:48:24 +09:00
  f7f4a57c5f
• Update framework
  Dean Herbert · 2019-12-10 16:43:58 +09:00
  609c511309
• Allow mods to apply to track, not clock (#7114)

  Allow mods to apply to track, not clock
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-12-10 16:34:52 +09:00
  26b9d5d051
• Merge branch 'master' into apply-to-track
  Dan Balasescu · 2019-12-10 16:15:24 +09:00
  bd6a08a21b
• Implement segmented slider paths (#7116)

  Implement segmented slider paths
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-12-10 15:45:17 +09:00
  9ab6949d87
• Merge branch 'master' into segmented-slider-paths-3
  Dean Herbert · 2019-12-10 14:28:20 +09:00
  5f3d163772
• Merge pull request #7130 from peppy/fix-song-select-filters

  Fix song select filters not reapplied if in a child screen

  Dan Balasescu · 2019-12-10 13:42:22 +09:00
  1ba59d6d5f
• Merge branch 'master' into fix-song-select-filters
  Dan Balasescu · 2019-12-10 13:20:24 +09:00
  48a75d116b
• Apply suggested refactorings
  smoogipoo · 2019-12-10 13:12:54 +09:00
  ab0f2e7c6a
• Merge pull request #7131 from peppy/delete-control-point-text

  Don't show count when deleting only one control point

  Dan Balasescu · 2019-12-10 13:07:09 +09:00
  db9b985767
• Don't show count when deleting only one control point

  Reads better.

  Dean Herbert · 2019-12-10 03:29:25 +09:00
  1db218f908
• Fix osu!catch catcher not scaling down correctly (#7129)

  Fix osu!catch catcher not scaling down correctly

  Dean Herbert · 2019-12-10 02:32:34 +09:00
  1a36179c8d
• Fix song select filters not reapplied if in a child screen

  Closes https://github.com/ppy/osu/issues/6980.

  Dean Herbert · 2019-12-10 02:30:23 +09:00
  cdde5d1d69
• Fix incorrect code migration

  Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dean Herbert · 2019-12-10 02:23:17 +09:00
  dc9775742c
• Fix osu!catch catcher not scaling down correctly
  Dean Herbert · 2019-12-10 02:00:39 +09:00
  1e71681916
• Fix control points not adding to last segment
  smoogipoo · 2019-12-09 22:44:47 +09:00
  2c4c190f15
• Refine generic constraints at game side (#7117)

  Refine generic constraints at game side

  Dean Herbert · 2019-12-09 22:40:47 +09:00
  428065ff43
• Consider having only 1 control point as being deleted
  smoogipoo · 2019-12-09 22:36:19 +09:00
  bd2b0af269
• Don't serialise path version
  smoogipoo · 2019-12-09 20:18:18 +09:00
  47f3c4a596
• Remove IComparable in constraint.
  Huo Yaoyuan · 2019-12-09 17:48:41 +08:00
  ad1fb3bda2
• Enum constraint for enum dropdown.
  Huo Yaoyuan · 2019-12-09 17:45:26 +08:00
  c3518a2b94
• Constrain transformable with class.
  Huo Yaoyuan · 2019-12-09 17:45:26 +08:00
  40a5c1fd96
• Constrain configuration lookup as enum.
  Huo Yaoyuan · 2019-12-09 17:45:26 +08:00
  04b3297a05
• Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3
  smoogipoo · 2019-12-09 18:25:27 +09:00
  cd61893814
• Split out complex method
  smoogipoo · 2019-12-09 18:25:13 +09:00
  6d9cd0fafe
• Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0 (#7112)

  Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0
  
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>

  Dean Herbert · 2019-12-09 18:18:59 +09:00
  dc45811dfd
• Bump System.IO.Packaging from 4.6.0 to 4.7.0 (#7113)

  Bump System.IO.Packaging from 4.6.0 to 4.7.0
  
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>

  Dean Herbert · 2019-12-09 18:18:50 +09:00
  3f500acf19
• Remove unused using
  smoogipoo · 2019-12-09 18:15:00 +09:00
  b6e2738236
• Make placement blueprint add an initial segment
  smoogipoo · 2019-12-09 18:10:40 +09:00
  2dbf94f3ab
• Remove unnecessary cast
  Dean Herbert · 2019-12-09 18:05:14 +09:00
  d650bfb6d6
• Fix bad ctor implementation
  smoogipoo · 2019-12-09 18:01:13 +09:00
  a1798fd38d
• Remove outdated assert
  smoogipoo · 2019-12-09 18:01:02 +09:00
  bfbb9aa18e
• Merge branch 'master' into fix-settings-bindable-logic
  Dean Herbert · 2019-12-09 17:55:17 +09:00
  c39d2f006c
• Remove automatic slider path offsetting
  smoogipoo · 2019-12-09 17:54:22 +09:00
  883d5bc11d
• Refactor hitobjects to remove default control point
  smoogipoo · 2019-12-09 17:48:27 +09:00
  fa1468325e
• Default to linear control point type
  smoogipoo · 2019-12-09 17:47:05 +09:00
  9cb649436c
• Simplify path/point construction
  smoogipoo · 2019-12-09 17:46:40 +09:00
  5a093c039c
• Allow mods to apply to track, not clock
  Dean Herbert · 2019-12-09 17:44:45 +09:00
  eb074b7058
• Bump System.IO.Packaging from 4.6.0 to 4.7.0

  Bumps [System.IO.Packaging](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
  - [Release notes](https://github.com/dotnet/corefx/releases)
  - [Commits](https://github.com/dotnet/corefx/commits)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-12-09 07:52:23 +00:00
  3861abce82
• Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0

  Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
  - [Release notes](https://github.com/dotnet/corefx/releases)
  - [Commits](https://github.com/dotnet/corefx/commits)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-12-09 07:52:22 +00:00
  b764a74919
• Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0 (#7109)

  Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0
  
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>

  Dean Herbert · 2019-12-09 16:51:03 +09:00
  7d6cd72a82
• General cleanups
  smoogipoo · 2019-12-09 16:44:19 +09:00
  53f7c753fb