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

24282 Commits

Author SHA1 Message Date
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods 2019-12-11 19:28:59 +09:00
Dean Herbert
697e200856
Move control point removal to SliderSelectionBlueprint (#7154)
Move control point removal to SliderSelectionBlueprint
2019-12-11 19:27:53 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods
Add per-mod settings
2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects (#7138)
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
Dean Herbert
23959f3a3c Move control point removal to SliderSelectionBlueprint 2019-12-11 18:58:35 +09:00
Dean Herbert
9831e3ad6b
Add right-click menu item to change control point type (#7127)
Add right-click menu item to change control point type

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-11 18:57:15 +09:00
Dean Herbert
b28d029cb9
Don't automatically pause when window is inactive if in break t… (#7150)
Don't automatically pause when window is inactive if in break time

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-11 18:56:55 +09:00
Dan Balasescu
900cbd7af3
Merge branch 'master' into customized-mods 2019-12-11 18:52:00 +09:00
Dan Balasescu
bad7b4eecf
Merge branch 'master' into no-pause-during-breaks 2019-12-11 18:20:50 +09:00
Dean Herbert
d82ba3e7f7 Curve -> Curve type 2019-12-11 18:20:28 +09:00
Dean Herbert
03040d1750 Don't show inherit menu item when first control point is selected 2019-12-11 18:18:16 +09:00
Dean Herbert
97ca2e2753 Add missing bezier option to menu 2019-12-11 17:58:59 +09:00
Dean Herbert
93a6827844
Add VS launcher profile for tournament client (#7140)
Add VS launcher profile for tournament client
2019-12-11 17:16:22 +09:00
Dean Herbert
cda6757f52
Merge branch 'master' into path-type-menuitem 2019-12-11 16:43:55 +09:00
Dean Herbert
c126cd8b01
Refactor path visualisers with bindables (#7122)
Refactor path visualisers with bindables

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-11 16:42:45 +09:00
Dean Herbert
632b1b9ee9
Merge branch 'master' into path-visualiser-refactor 2019-12-11 16:24:45 +09:00
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
mcendu
dbe46c6cf7
conform to coding styles 2019-12-10 20:40:10 +08: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