1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 00:23:22 +08:00
Commit Graph

24388 Commits

Author SHA1 Message Date
Dean Herbert
11dc705892
Exclude "cursormiddle" from click expanding animation (#7118)
Exclude "cursormiddle" from click expanding animation

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-11 16:24:34 +09:00
Dean Herbert
d8cebd20ed Add xmldoc 2019-12-11 16:06:20 +09:00
Dean Herbert
86dac28dcb Merge remote-tracking branch 'upstream/master' into cursor-expand 2019-12-11 16:06:13 +09:00
Dean Herbert
274958669c Add early assert as sanity check 2019-12-11 15:47:41 +09:00
Dean Herbert
75f9250645 Don't automatically pause when window is inactive if in break time 2019-12-11 15:46:07 +09:00
Dean Herbert
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
Dean Herbert
ae0121c30f
Fix some weird private field names (#7149)
Fix some weird private field names
2019-12-11 15:02:24 +09:00
Dean Herbert
9ebad16436 Fix logic regression 2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11 Fix some weird private field names 2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f Merge branch 'customized-mods' into adjustable-rate-mods 2019-12-11 13:26:05 +09:00
Dean Herbert
5624b9fd3f Fix US english 2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0 Simplify settings update logic 2019-12-11 13:19:02 +09:00
Salman Ahmed
53daa37eaa Fix failing tests 2019-12-10 23:06:13 +03:00
mcendu
dbe46c6cf7
conform to coding styles 2019-12-10 20:40:10 +08:00
Salman Ahmed
63f66aa5fa Check by UserDimContainer.DimLevel instead 2019-12-10 15:25:03 +03:00
Salman Ahmed
38f1a8bc17 Bind UserDimContainer.IsBreakTime from Player 2019-12-10 15:14:47 +03:00
Salman Ahmed
bb078c2afc Lighten user-dim container if on break time 2019-12-10 15:13:44 +03:00
Salman Ahmed
b93bbf81aa Add lighten background during breaks setting 2019-12-10 15:10:35 +03:00
mcendu
1afeaf31bc
make OsuCursorSprite abstract 2019-12-10 19:58:56 +08:00
mcendu
e37369304b property-ize expand target 2019-12-10 19:45:06 +08:00
mcendu
06cde2b0c2
remove unused using directive 2019-12-10 19:30:46 +08:00
Huo Yaoyuan
48976f5d0e Add VS launcher profile for tournament client. 2019-12-10 18:19:53 +08:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Dean Herbert
f3ec98d85f
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
2019-12-10 19:12:58 +09:00
Dean Herbert
f6c0b5c44a
Merge branch 'master' into settings-source 2019-12-10 18:49:41 +09:00
Dean Herbert
33f946da3b
Fix SettingsItem bindable logic (#7080)
Fix SettingsItem bindable logic
2019-12-10 18:49:16 +09:00
Dean Herbert
efc3b7fc9f
Merge branch 'master' into fix-settings-bindable-logic 2019-12-10 18:30:27 +09:00
Dean Herbert
491c9aaedb
Merge pull request #7139 from peppy/update-framework
Update framework
2019-12-10 18:30:05 +09:00
Dean Herbert
f593caf0ea Remove unused class 2019-12-10 18:08:51 +09:00
Dean Herbert
55c938e5da Fix bindable usage 2019-12-10 18:08:24 +09:00
Dean Herbert
65f2d1f875 Update framework 2019-12-10 17:49:42 +09:00
Dean Herbert
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
Dean Herbert
609c511309 Update framework 2019-12-10 16:43:58 +09:00
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
smoogipoo
e9ec6591a9 Separate path connections from control points 2019-12-10 11:20:08 +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