1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 03:27:25 +08:00
Commit Graph

24346 Commits

Author SHA1 Message Date
Dean Herbert
26b9d5d051
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>
2019-12-10 16:34:52 +09:00
Dan Balasescu
42a979b495
Merge branch 'master' into path-visualiser-refactor 2019-12-10 16:33:45 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track 2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d Refactor distance snap grid to not require hitobjects 2019-12-10 16:00:09 +09:00
Dean Herbert
9ab6949d87
Implement segmented slider paths (#7116)
Implement segmented slider paths

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-10 15:45:17 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
Dan Balasescu
1ba59d6d5f
Merge pull request #7130 from peppy/fix-song-select-filters
Fix song select filters not reapplied if in a child screen
2019-12-10 13:42:22 +09:00
Dan Balasescu
48a75d116b
Merge branch 'master' into fix-song-select-filters 2019-12-10 13:20:24 +09:00
smoogipoo
ab0f2e7c6a Apply suggested refactorings 2019-12-10 13:12:54 +09:00
Dan Balasescu
db9b985767
Merge pull request #7131 from peppy/delete-control-point-text
Don't show count when deleting only one control point
2019-12-10 13:07:09 +09:00
Dean Herbert
1db218f908 Don't show count when deleting only one control point
Reads better.
2019-12-10 03:29:25 +09:00
Dean Herbert
1a36179c8d
Fix osu!catch catcher not scaling down correctly (#7129)
Fix osu!catch catcher not scaling down correctly
2019-12-10 02:32:34 +09:00
Dean Herbert
cdde5d1d69 Fix song select filters not reapplied if in a child screen
Closes https://github.com/ppy/osu/issues/6980.
2019-12-10 02:30:23 +09:00
Dean Herbert
dc9775742c
Fix incorrect code migration
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-12-10 02:23:17 +09:00
Dean Herbert
1e71681916 Fix osu!catch catcher not scaling down correctly 2019-12-10 02:00:39 +09:00
smoogipoo
1b14b0e5b6 Fix pieces blocking context menu 2019-12-10 00:08:38 +09:00
smoogipoo
9b318d2869 Add right-click menu item to change path type 2019-12-10 00:07:07 +09:00
smoogipoo
0ee303f7d6 Remove unused using 2019-12-09 22:45:44 +09:00
smoogipoo
2c4c190f15 Fix control points not adding to last segment 2019-12-09 22:44:47 +09:00
Dean Herbert
428065ff43
Refine generic constraints at game side (#7117)
Refine generic constraints at game side
2019-12-09 22:40:47 +09:00
smoogipoo
bd2b0af269 Consider having only 1 control point as being deleted 2019-12-09 22:36:19 +09:00
smoogipoo
af90b45c40 Refactor path visualisers to use bindables 2019-12-09 20:49:59 +09:00
smoogipoo
47f3c4a596 Don't serialise path version 2019-12-09 20:18:18 +09:00
mcendu
22f2a4bed2
Fix LegacyCursor's cursormiddle expanding 2019-12-09 17:53:16 +08:00
mcendu
1e49078c52
Add OsuCursorSprite 2019-12-09 17:51:44 +08:00
Huo Yaoyuan
ad1fb3bda2 Remove IComparable in constraint. 2019-12-09 17:48:41 +08:00
Huo Yaoyuan
c3518a2b94 Enum constraint for enum dropdown. 2019-12-09 17:45:26 +08:00
Huo Yaoyuan
40a5c1fd96 Constrain transformable with class. 2019-12-09 17:45:26 +08:00
Huo Yaoyuan
04b3297a05 Constrain configuration lookup as enum. 2019-12-09 17:45:26 +08:00
smoogipoo
cd61893814 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 18:25:27 +09:00
smoogipoo
6d9cd0fafe Split out complex method 2019-12-09 18:25:13 +09:00
Dean Herbert
dc45811dfd
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>
2019-12-09 18:18:59 +09:00
Dean Herbert
3f500acf19
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>
2019-12-09 18:18:50 +09:00
smoogipoo
b6e2738236 Remove unused using 2019-12-09 18:15:00 +09:00
smoogipoo
2dbf94f3ab Make placement blueprint add an initial segment 2019-12-09 18:10:40 +09:00
Dean Herbert
d650bfb6d6 Remove unnecessary cast 2019-12-09 18:05:14 +09:00
smoogipoo
a1798fd38d Fix bad ctor implementation 2019-12-09 18:01:13 +09:00
smoogipoo
bfbb9aa18e Remove outdated assert 2019-12-09 18:01:02 +09:00
Dean Herbert
c39d2f006c Merge branch 'master' into fix-settings-bindable-logic 2019-12-09 17:55:17 +09:00
smoogipoo
883d5bc11d Remove automatic slider path offsetting 2019-12-09 17:54:22 +09:00
smoogipoo
fa1468325e Refactor hitobjects to remove default control point 2019-12-09 17:48:27 +09:00
smoogipoo
9cb649436c Default to linear control point type 2019-12-09 17:47:05 +09:00
smoogipoo
5a093c039c Simplify path/point construction 2019-12-09 17:46:40 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
dependabot-preview[bot]
3861abce82
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>
2019-12-09 07:52:23 +00:00
dependabot-preview[bot]
b764a74919
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>
2019-12-09 07:52:22 +00:00
Dean Herbert
7d6cd72a82
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>
2019-12-09 16:51:03 +09:00
smoogipoo
53f7c753fb General cleanups 2019-12-09 16:44:19 +09:00
dependabot-preview[bot]
12cfb7dedb
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0
Bumps [System.ComponentModel.Annotations](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>
2019-12-09 07:28:11 +00:00
Dean Herbert
fbd0bfac60
Improve animation of popup dialog buttons (#7082)
Improve animation of popup dialog buttons

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-09 16:00:39 +09:00