1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 21:02:59 +08:00
Commit Graph

56 Commits

Author SHA1 Message Date
Dan Balasescu
fcf51a6f51
Merge pull request #18530 from peppy/add-cloen-button
Change text on timing group add button when it is going to clone instead
2022-06-03 22:23:04 +09:00
Dan Balasescu
dd93fc283b
Merge pull request #18531 from peppy/track-groups-better
Improve group tracking logic to avoid switching which point type unnecessarily
2022-06-03 13:04:54 +09:00
Bartłomiej Dach
87ec2e490d
Merge branch 'master' into deselect-control-group 2022-06-03 00:47:06 +02:00
Dean Herbert
ad3c093a08 Improve group tracking logic to avoid switching which point type unnecessarily 2022-06-02 18:33:09 +09:00
Dean Herbert
2fa4d46f73 Change text on timing group add button when it is going to clone instead
Also disables the button when it would otherwise have no effect.
2022-06-02 18:28:16 +09:00
Dean Herbert
0b125ade4c Allow clicking away to deselect the current control point group 2022-06-02 18:18:18 +09:00
Dean Herbert
5a0f716bf2 Fix timing screen crash when attempting to add group to self
Closes #18527.
2022-06-02 18:14:28 +09:00
Dean Herbert
6b297bc6ed
Merge pull request #18502 from peppy/editor-timing-follow-current-time
Add automatic control point tracking to the timing screen
2022-06-02 07:37:03 +09:00
Bartłomiej Dach
6b709de2c2
Remove unused using directive 2022-06-01 20:18:02 +02:00
Dean Herbert
534e8f8fac Only switch to found group if non-null 2022-06-01 20:20:48 +09:00
Dean Herbert
187acb0718 Simplify linq tracking logic 2022-06-01 17:57:53 +09:00
Dean Herbert
c55c3325a4 Remove unused using statements 2022-06-01 17:43:40 +09:00
Dean Herbert
25941f6187
Use DeepClone instead of reflection call
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-06-01 10:47:45 +09:00
Dean Herbert
8240b645b4 Copy attribute types from currently selected control point to new placements 2022-05-31 21:50:12 +09:00
Dean Herbert
f99bcb23a0 Automatically make first control point added to beatmap have timing data 2022-05-31 21:50:08 +09:00
Dean Herbert
cf5da44492 Add automatic control point tracking to the timing screen 2022-05-31 15:00:30 +09:00
Dean Herbert
17206bbebf Update screen padding and colouring to better match new designs 2022-05-24 18:43:22 +09:00
Dean Herbert
a346990a8c Remove TriangleButton usage in editor 2022-05-24 18:13:09 +09:00
Dean Herbert
d2e0e8ad94 Reverse direction of binding to allow for better abstract class definitions 2021-05-12 16:53:58 +09:00
Dean Herbert
097a347533 Adjust Add different background colour for timing area 2021-04-19 18:25:30 +09:00
Dean Herbert
f4baff9e04 Make TimingScreen use rounded screen and adjust spacing/padding 2021-04-19 14:35:35 +09:00
Dean Herbert
0c918410d0 Make "add" button more visible 2021-04-19 13:15:24 +09:00
Dean Herbert
658c23c925 Give more space to the parameter adjustment area 2021-04-19 13:15:17 +09:00
Dean Herbert
7fdf876b4c Fix editor timing screen mutating the WorkingBeatmap instead of EditorBeatmap 2021-01-04 16:38:15 +09:00
Bartłomiej Dach
610ed99ae3 Add null checks to unguarded resolved-as-null fields 2020-11-14 14:52:58 +01:00
Dean Herbert
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
Dean Herbert
e1f578c590 Change editor timing screen seek behaviour to only occur on clicking table rows
Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).

Closes #10590.
2020-10-27 12:28:12 +09:00
Dan Balasescu
16a599850c
Merge branch 'master' into more-timeline-toggles 2020-10-05 17:33:18 +09:00
Dean Herbert
c1c5b5da8e Push state change on control point group addition / removal 2020-10-02 17:49:38 +09:00
Dean Herbert
0d03084cdc Move control point display to the base timeline class
We want them to display on all screens with a timeline as they are quite
useful in all cases.
2020-10-01 18:16:12 +09:00
Dean Herbert
a11c74d600 Update to consume framework fixes 2020-09-30 20:27:02 +09:00
Dean Herbert
698042268f Show control points in timing screen timeline 2020-09-30 17:00:42 +09:00
Dean Herbert
5b200a8ca4 Change default zoom of timing screen timeline to most zoomed out 2020-09-30 16:39:27 +09:00
Dean Herbert
a40c2ea5ee Simplify control point group binding/update logic 2020-09-30 16:02:22 +09:00
Dean Herbert
158d307126 Avoid destroying editor screens when changing between modes 2020-09-24 17:03:54 +09:00
Dean Herbert
d45a1521a1 Update BindableList usages 2020-09-01 11:56:23 +09:00
Dean Herbert
1486a44b55 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-22 19:51:02 +09:00
Dean Herbert
8b79e14225 Fix remaining test regressions 2020-05-22 19:49:49 +09:00
Dean Herbert
d18eb663b1 Add tweening seek support to EditorClock 2020-05-22 16:47:52 +09:00
Dean Herbert
dd09d7830d Cache and resolve editor clock as EditorClock in all cases 2020-05-22 16:44:06 +09:00
smoogipoo
322a1f0a86 Fix potential nullref 2019-11-06 12:45:35 +09:00
smoogipoo
7cd4cb8a93 Rename selectedPoints to selectedGroup 2019-11-06 12:32:12 +09:00
Dean Herbert
29e20bc8d2 Add xmldoc and combine GroupAt / CreateGroup 2019-10-28 10:45:11 +09:00
Dean Herbert
81b5d7b79f Select another group after deleting selected 2019-10-27 16:30:05 +09:00
Dean Herbert
73369ae613 Add the ability to add/remove groups 2019-10-27 16:13:24 +09:00
Dean Herbert
b8efc59cdc Update UI components to use new grouping 2019-10-25 20:13:22 +09:00
Dean Herbert
c06f142433 Fix some spacing and references 2019-10-23 11:22:55 +09:00
Dean Herbert
5e22eed131 Add add/remove buttons 2019-10-22 21:50:21 +09:00
Dean Herbert
81e8b678d3 Update editor time when a new timing point is selected 2019-10-22 20:17:19 +09:00
Dean Herbert
80bf68c108 Add control sections and hook up bindable control groups 2019-10-21 00:06:38 +09:00