1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 17:45:07 +08:00
Commit Graph

1076 Commits

Author SHA1 Message Date
Bartłomiej Dach
882df6b828
Remove unused field
Not sure why inspectcode is quiet about this?
2024-10-16 09:59:05 +02:00
Bartłomiej Dach
dcf78a6e2c
Merge branch 'master' into grids 2024-10-16 09:55:27 +02:00
Bartłomiej Dach
b92cbff81d
Merge branch 'master' into scale-with-no-axes-should-do-nothing 2024-10-15 14:20:24 +02:00
Bartłomiej Dach
634f20e8de
Ensure at least scale popover axis toggle is active at any time
As in, toggling off an axis if it is the only one enabled will enable
the other one in turn.

Co-authored-by: Dean Herbert <pe@ppy.sh>
2024-10-15 14:12:17 +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
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