1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 16:22:55 +08:00
Commit Graph

1132 Commits

Author SHA1 Message Date
Marvin Schürz
9e97141e33 Fix off-by-one error 2024-10-11 22:03:21 +02:00
Marvin Schürz
8e781c170d Inline scheduler calls 2024-10-11 19:24:46 +02:00
Dean Herbert
05c8b3cbce
Simplify cycle logic 2024-10-12 02:18:36 +09:00
Bartłomiej Dach
4e8e4a34bd
Fix scale popover doing things when both scale axes are turned off
Spotted in passing when reviewing https://github.com/ppy/osu/pull/30080.
The popover would very arbitrarily revert to scaling by Y axis if both
checkboxes were checked off.

Not sure how this passed review.
2024-10-11 15:18:43 +02:00
Bartłomiej Dach
5db1f05953
Merge branch 'master' into clamp-scale2 2024-10-11 15:13:54 +02:00
Bartłomiej Dach
d1da1d4079
Rename methods to fit new changes better 2024-10-11 15:03:30 +02:00
OliBomby
550e575221 Rename "Cycle grid display mode" to "Cycle grid spacing"
The "display mode" is easy to confuse with grid type, so I renamed it to literally the grid property it affects.
2024-10-11 14:09:50 +02:00
OliBomby
ada20d230a Fix grid type cycling not taking into account the radio button selection 2024-10-11 14:09:50 +02:00
OliBomby
b93bc21e45 Add back the old keybind for cycling grid spacing 2024-10-11 14:09:50 +02:00
OliBomby
d98cc7fe66 use G to change grid type 2024-10-11 14:09:50 +02:00
Marvin Schürz
7e439be9ec Fix crash from non-serializable hitobject samples 2024-10-11 11:47:23 +02:00
Marvin Schürz
5c74fceff6 Remove objects when polygon is invalid 2024-10-11 11:46:57 +02:00
Marvin Schürz
96769897bf Extract method for scheduler call 2024-10-11 11:38:32 +02:00
Marvin Schürz
88fa6f6bc6 Optimize PolygonGenerationPopover 2024-10-11 11:33:53 +02:00
OliBomby
9936ec579f Fix isSplittable depending on unreliable order of path control point pieces 2024-10-09 23:31:12 +02:00
OliBomby
de2f9dec39 Let right-click reset grid to default values 2024-10-08 10:51:35 +02:00
OliBomby
e794862da5 update comment 2024-10-08 10:46:10 +02:00
Dean Herbert
b1be31cd6a
Switch back to last tool after using grid tool, rather than always select tool 2024-10-08 17:34:51 +09:00
OliBomby
dc267733d1 Use FA icon instead 2024-10-07 19:09:21 +02:00
OliBomby
66459c50de Rename to 'Grid' 2024-10-07 19:09:09 +02:00
OliBomby
076c8dec5a Revert "Use new place grid icon"
This reverts commit db10202642.
2024-10-07 19:06:32 +02:00
OliBomby
db10202642 Use new place grid icon 2024-10-07 16:51:53 +02:00
OliBomby
533ed609fb Fix crash on placing circular grid 2024-10-07 16:19:01 +02:00
OliBomby
a755ae70a3 fix warning 2024-10-07 12:13:56 +02:00
OliBomby
7b998219d7 move grid placement tool to left toolbox 2024-10-07 12:04:14 +02:00
Dean Herbert
1ab02b93b3
Merge branch 'master' into grids-4 2024-10-07 15:42:23 +09:00
OliBomby
cc29e8c16d introduce tooltip to rounded button with subclass instead 2024-10-05 15:16:29 +02:00
Bartłomiej Dach
7816c41b94
Only transfer difficulty slider values on commit
Closes https://github.com/ppy/osu/issues/30112.
2024-10-04 14:08:46 +02:00
OliBomby
19d8be4890 Add more comments 2024-10-03 11:49:45 +02:00
Bartłomiej Dach
b15608343b
Replace setup screen controls with new "form" controls 2024-10-03 11:49:03 +02:00
OliBomby
0695d51968 Set minimum scale to 0.5 2024-10-01 16:48:55 +02:00
OliBomby
08e1698bb6 fix scale clamp computation and code cleanup 2024-10-01 16:45:39 +02:00
OliBomby
0677430975 compute lower bound in clamp scale 2024-10-01 16:45:27 +02:00
OliBomby
4959045851 Remove 'Centre on selected object' button 2024-10-01 15:53:39 +02:00
OliBomby
f8397cccc7 Merge remote-tracking branch 'upstream/master' into grids-4 2024-10-01 15:43:54 +02:00
OliBomby
c84bb4b797 Update tooltip 2024-10-01 15:38:21 +02:00
OliBomby
4de73dd9c8 Reapply "Add tooltip to rounded button"
This reverts commit 1912b1fcf3.
2024-10-01 15:28:13 +02:00
Dean Herbert
54e68005ef
Merge pull request #29691 from bdach/hotkeys-in-context-menus
Add hotkey hints to editor menus
2024-10-01 19:29:05 +09:00
Dean Herbert
8ea1ff5de6
Merge pull request #30069 from peppy/grid-to-current-object
Add button to centre editor grid to current hit object
2024-10-01 19:24:46 +09:00
Dean Herbert
24d534929d
Less var please 2024-10-01 18:44:27 +09:00
Bartłomiej Dach
9dad38c457
Fix button being interactable when collapsed
Did not match the expandable button in distance snap toolbox.
2024-10-01 11:35:43 +02:00
Dean Herbert
87ab953935
Merge pull request #30062 from bdach/distance-snap-weirdness
Fix various distance snap grid weirdness around unsnapped objects
2024-10-01 16:16:22 +09:00
Dean Herbert
590f27e0a0
Merge branch 'master' into hotkeys-in-context-menus 2024-10-01 15:50:19 +09:00
Dean Herbert
0409edccce
Add button to centre editor grid to current hit object 2024-10-01 15:22:05 +09:00
Bartłomiej Dach
48b03a328b
Ensure sliders are snapped when changing path types
Closes https://github.com/ppy/osu/issues/29915.

Uses behaviour suggested in
https://github.com/ppy/osu/issues/29915#issuecomment-2361843011.
2024-09-30 14:38:20 +02:00
Bartłomiej Dach
75fc57c34b
Fix distance spacing grid displaying incorrectly for unsnapped objects with duration 2024-09-30 13:36:16 +02:00
OliBomby
1912b1fcf3 Revert "Add tooltip to rounded button"
This reverts commit 3e4cd0aeac.
2024-09-28 17:33:24 +02:00
OliBomby
4568af8fda Combine drag and clicky interactions 2024-09-28 17:26:39 +02:00
OliBomby
3e4cd0aeac Add tooltip to rounded button 2024-09-28 17:04:20 +02:00
OliBomby
1c6e42671a return grid placement tool to right toolbox 2024-09-28 17:04:11 +02:00
OliBomby
b1e381a391 Update tooltip for drag 2024-09-28 15:59:07 +02:00
OliBomby
4e2bc0d1bd place grid with drag instead 2024-09-28 15:56:37 +02:00
Dean Herbert
c46d787f1e
Merge pull request #29949 from minetoblend/feature/scale-around-center
Support scaling around center when scaling with select box
2024-09-28 21:37:39 +09:00
Bartłomiej Dach
fa90b43233
Merge branch 'master' into selection-center 2024-09-27 09:30:36 +02:00
OliBomby
b179e086c6 Merge remote-tracking branch 'upstream/master' into grids-4 2024-09-26 14:59:52 +02:00
OliBomby
e3b4483872 Refactor PlacementBlueprint to not be hitobject specific 2024-09-24 20:31:00 +02:00
Bartłomiej Dach
86432078dd
Remove usage of switch expression syntax
It's not universally accepted here and a `when` crept in that can be
bypassed entirely using rather clean baseline language constructs, so
why bother at this point.
2024-09-24 11:53:02 +02:00
OliBomby
0f0f490598 Don't snap to global grid while placing grid 2024-09-23 17:24:09 +02:00
OliBomby
fe10621771 Clarify criteria of grid spacing subdivision 2024-09-23 16:39:09 +02:00
OliBomby
0a5a463380 Convert 'grid from points' button to placement tool 2024-09-23 16:36:45 +02:00
OliBomby
1a81e12192 Refactor PlacementBlueprint to not be hitobject specific 2024-09-23 16:33:36 +02:00
Marvin Schürz
3180468db1 Prevent the distance snap grid from being activated by alt key while dragging select box handle 2024-09-21 14:22:17 +02:00
Marvin Schürz
8bca8d6072 Restore previous scale behavior when using scale popover 2024-09-20 17:38:49 +02:00
Marvin Schürz
8ceea9a5f7 Use scale origin when scaling sliders 2024-09-20 17:19:38 +02:00
OliBomby
8e11cda41a use minimum enclosing circle selection centre in scale 2024-09-20 01:07:54 +02:00
OliBomby
ee00624751 use minimum enclosing circle selection centre in rotation 2024-09-20 01:07:47 +02:00
OliBomby
d2f97f5908 take into account rotation period for each grid type 2024-09-19 20:18:24 +02:00
OliBomby
e3aeaf6d85 Merge remote-tracking branch 'upstream/master' into grids-4 2024-09-19 20:06:47 +02:00
Dean Herbert
188a430418
Merge branch 'master' into grids-3 2024-09-19 18:21:05 +09:00
Bartłomiej Dach
67a7f608f1
Fix slider end drag marker being in incorrect position for stacked sliders
Closes https://github.com/ppy/osu/issues/29884.
2024-09-17 08:23:46 +02:00
Dean Herbert
58fe502af4
Merge branch 'master' into beatmap-info-purge 2024-09-15 04:53:35 +09:00
Bartłomiej Dach
130802e480
Add hotkey hints to editor menus 2024-09-04 12:16:54 +02:00
Andrei Zavatski
f5a2b5ea03 Use FastCircle in demanding places in the editor 2024-08-30 17:45:26 +03:00
Dean Herbert
1b26e1c126
Merge branch 'master' into free-sliders 2024-08-27 13:32:24 +09:00
Dean Herbert
50a8348bf9
Apply NRT to remaining classes in slider blueprint namespace 2024-08-27 13:18:55 +09:00
Dean Herbert
4fc96ebfde
Tidy some thing up 2024-08-27 13:13:22 +09:00
OliBomby
094b184191 snap the slider duration in normal drag 2024-08-21 12:28:56 +02:00
Dan Balasescu
86c3c115f6
Make grid/distance snap binds T/Y respectively 2024-08-20 12:15:33 +09:00
Dean Herbert
0c6bee4033
Merge branch 'master' into free-sliders 2024-08-19 14:27:54 +09:00
Dean Herbert
7248c04ba4
Merge branch 'master' into polygon-tool 2024-08-19 13:54:02 +09:00
Dean Herbert
95d06333c1
Fix typo in editor field 2024-08-19 13:49:59 +09:00
Dean Herbert
f34132fd6b
Merge branch 'master' into polygon-tool 2024-08-19 13:00:02 +09:00
Dan Balasescu
3b94d1f8eb
Merge pull request #29433 from OliBomby/grid-anchors
Fix grid snap slider placement double-click not making new segment if anchor not hovered
2024-08-16 17:42:15 +09:00
OliBomby
00e210147a Fix inputs being eaten by PathControlPointVisualizer when no control points are selected 2024-08-15 23:11:07 +02:00
OliBomby
f717938a28 Fix grid snap slider placement double-click does not make new segment if anchor not hovered 2024-08-15 22:49:05 +02:00
OliBomby
ae47671d17 clarify angle ranges in HandleFlip 2024-08-13 14:21:42 +02:00
Bartłomiej Dach
06c2952fe8
Merge branch 'master' into grids-3 2024-08-12 13:55:35 +02:00
Dean Herbert
8fdd94090b
Show object inspector values during placement 2024-08-09 18:02:37 +09:00
Dean Herbert
d707e29ff7
Merge branch 'master' into beatmap-info-purge 2024-07-23 12:09:32 +09:00
OliBomby
c57232c220 enforce minimum duration based on snap 2024-07-22 11:58:53 +02:00
OliBomby
9fb9a54a4d hold shift to adjust velocity instead of duration 2024-07-22 11:34:07 +02:00
Dean Herbert
c1414f332e
Merge branch 'master' into free-sliders 2024-07-18 18:13:43 +09:00
OliBomby
7dc006f9ba fix horizontal flip rotation 2024-07-16 13:19:01 +02:00
OliBomby
2bbaa8e43c make flips grid-type aware 2024-07-14 18:12:55 +02:00
OliBomby
a80e333786 add playfield origin as third origin option 2024-07-14 17:27:04 +02:00
OliBomby
9e5d099b1b rename playfield centre origin to grid centre 2024-07-14 17:13:22 +02:00
OliBomby
7a319a6d74 dont rotate scale when in selection origin mode 2024-07-14 17:03:17 +02:00
OliBomby
58eb7f6fe1 fix rotated scale bounds again 2024-07-14 16:58:05 +02:00
OliBomby
ae38002777 Revert "fix incorrect rotated bound checking"
This reverts commit 4165ded813.
2024-07-14 15:46:40 +02:00
Bartłomiej Dach
37a296ba4c
Limit per-frame movement hitobject processing to stacking updates 2024-07-11 13:36:14 +02:00