1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 15:17:44 +08:00
Commit Graph

1088 Commits

Author SHA1 Message Date
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
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
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
Bartłomiej Dach
38796aa7e7
Merge branch 'master' into stacking-updates 2024-07-11 13:23:11 +02:00
Bartłomiej Dach
c8a64c5950
Remove setup screen controls that do nothing useful
Before I go with a hammer to redesign these, I want to remove stuff that
does nothing first.

Hard-breaks API to allow rulesets to specify an enumerable of custom
sections rather than two specific weird ones.

For specific rulesets:

- osu!:
  - Stack leniency slider merged into difficulty section.
- osu!taiko:
  - Approach rate and circle size sliders removed.
  - Colours section removed.
- osu!catch:
  - No functional changes.
- osu!mania:
  - Special style toggle merged into difficulty section.
  - Colours section removed.
2024-07-10 14:53:16 +02:00
Bartłomiej Dach
9cc0e0137b
Snap to stack in osu! composer when dragging to any of the items on it
Previously it would be required to drag to the starting position of the
stack which feels weird.
2024-07-09 13:58:58 +02:00
Bartłomiej Dach
ec9040798f
Run stacking when performing movement in osu! composer
Closes https://github.com/ppy/osu/issues/28635.
2024-07-09 13:52:36 +02:00
OliBomby
89f106d14f Merge remote-tracking branch 'upstream/master' into free-sliders 2024-07-03 20:40:25 +02:00
OliBomby
5697c82bb8 add a small bias towards longer distances to prevent jittery behaviour on path self-intersections 2024-07-03 20:33:00 +02:00
OliBomby
3926af1053 Use draggable handle for length adjust 2024-07-03 20:17:39 +02:00
OliBomby
dfe6c70996 prevent flipping objects far offscreen 2024-07-03 19:08:31 +02:00
OliBomby
4165ded813 fix incorrect rotated bound checking 2024-07-03 19:03:15 +02:00
Dean Herbert
e151454c4e
Add missing check for curve menu items not yet being created 2024-07-04 01:00:51 +09:00
Dean Herbert
f7339e3e8b
Remove outdated(?) todo 2024-07-04 00:26:00 +09:00
Dean Herbert
6abb728cd5
Change menu items to be in same order as hotkeys 2024-07-04 00:22:46 +09:00
Dean Herbert
42aff953d9
Ensure menu items update when curve type changes 2024-07-04 00:19:20 +09:00
OliBomby
0797d942ae fix warning 2024-07-03 16:41:57 +02:00
OliBomby
979a5e9f3e simplify code 2024-07-03 16:41:41 +02:00
OliBomby
d0715c5f12 scale along rotated axis 2024-07-03 16:23:19 +02:00
Dean Herbert
88375694a3
Merge branch 'master' into slider-anchor-type-switching 2024-07-03 22:36:57 +09:00
OliBomby
5f8512896e use grid origin in scale tool 2024-07-03 12:40:22 +02:00
OliBomby
b15028a918 fixes 2024-07-03 12:36:12 +02:00
OliBomby
c285744509 Merge remote-tracking branch 'upstream/master' into grids-3 2024-07-03 12:25:57 +02:00
Bartłomiej Dach
17ce9cd162
Merge branch 'master' into grids-2 2024-07-03 10:57:05 +02:00
Dean Herbert
7203cb7d6f
Merge branch 'master' into better-slider-selection-box-size 2024-07-03 16:30:10 +09:00
Dean Herbert
5350945340
Update HasFlag usages 2024-07-03 00:19:04 +09:00
Dean Herbert
fd6b77ea92
Fix distance snap control being removed 2024-06-27 23:59:38 +09:00
Dean Herbert
b293eb7930
Remove redundant array spec 2024-06-27 22:19:06 +09:00
Bartłomiej Dach
1b741dada3
Show distance in pixels to previous/next object in osu! hitobject inspector 2024-06-27 14:46:57 +02:00
Bartłomiej Dach
2fda45cad4
Fix crashes when opening scale/rotation popovers during selection box operations 2024-06-25 15:20:59 +02:00
Olivier Schipper
4c6741e8aa
Fix exception type
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-06-20 17:27:38 +02:00
Bartłomiej Dach
225b309ba3
Reimplement stable polygon tool
Addresses https://github.com/ppy/osu/discussions/19970.

While yes, https://github.com/ppy/osu/pull/26303 is also a thing,
in discussing with users I don't think that grids are going to be able
to deprecate this feature.

Logic transcribed verbatim from stable.
2024-06-20 16:29:46 +02:00
Bartłomiej Dach
ad2cd0ba8f
Adjust behaviour of hit animations toggle to match user expectations 2024-06-20 13:42:32 +02:00
OliBomby
956bdbca50 fix tests 2024-06-20 00:17:16 +02:00
OliBomby
b24bfa2908 click to choose length instead of drag 2024-06-20 00:02:43 +02:00
OliBomby
d7fee53d67 Merge remote-tracking branch 'upstream/master' into free-sliders 2024-06-19 23:15:41 +02:00
OliBomby
efc8e1431a activate length change with context menu 2024-06-19 23:15:35 +02:00
OliBomby
f2bd6fac47 fix codefactor 2024-06-19 21:10:30 +02:00
OliBomby
ce4567f87b adjust rotation bounds based on grid type 2024-06-19 20:46:55 +02:00
Bartłomiej Dach
5fe21f16b9
Fix test failures 2024-06-18 10:41:26 +02:00
Bartłomiej Dach
87888ff0bb
Extend slider selection box bounds to contain all control points inside
Previously, the selection box was only guaranteed to contain the actual
body of the slider itself, the control point nodes were allowed to exit
it. This lead to a lot of weird interactions with the selection box
controls (rotation/drag handles, also the buttons under/over it) as the
slider anchors could overlap with them.

To bypass this issue entirely just ensure that the selection box's size
does include the control point nodes at all times.
2024-06-18 10:28:36 +02:00
Bartłomiej Dach
a3326086f7
Adjust hotkeys to address feedback 2024-06-18 08:25:05 +02:00
Bartłomiej Dach
310265c43f
Add slider placement binding description in tooltip 2024-06-18 08:16:25 +02:00
Bartłomiej Dach
683d5310b1
Implement direct choice of slider control point path type via Alt-number 2024-06-17 18:33:36 +02:00
Bartłomiej Dach
a631d245da
Fix test failure 2024-06-17 18:14:33 +02:00