1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 05:22:54 +08:00
Commit Graph

6143 Commits

Author SHA1 Message Date
OliBomby
66bf6ed6b4 Close scale/rotate popover on Enter keypress
This matches the expectation from stable where the popover also closes when you press enter. The side-effect is that spacebar also causes it to close, but luckily you don't need spacebar in the popover.
2024-10-16 21:53:56 +02:00
OliBomby
c5e406a007 add keyboard step matching osu stable 2024-10-16 21:18:48 +02:00
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
jhk2601
bf970afddb Formatting 2024-10-15 16:27:05 -04:00
jhk2601
f6566f9157 Code quality touch-ups 2024-10-15 15:37:05 -04: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
Bartłomiej Dach
232301f27d
Terminate existing anchor create operation when object is deselected 2024-10-15 12:54:11 +02:00
Bartłomiej Dach
1a7acbac33
Terminate existing anchor drag operations when object is deselected 2024-10-15 12:53:40 +02:00
jhk2601
86a5760ef4 Remove handling for zero as MaxSizeComboCount, set lower limit as 5 2024-10-15 02:23:41 -04:00
jhk2601
28879529db Merge https://github.com/ppy/osu into std_mod_bloom 2024-10-15 02:15:46 -04:00
jhk2601
bd71da012a Refactors handling of scale to a function 2024-10-15 02:14:03 -04:00
Bartłomiej Dach
1f1a174c50
Remove no longer required nested object reposition hacks
As touched on in
https://github.com/ppy/osu/issues/30237#issuecomment-2408557766, these
types of maneouvers are no longer required after
https://github.com/ppy/osu/pull/30021 - although as it turns out on
closer inspection, these things being there still *did not actually
break anything*, because the `slider.Path` mutation at the end of
`modifySlider()` causes `updateNestedPositions()` to be called
eventually anyway. So this is at mostly a code quality upgrade.
2024-10-14 14:26:27 +02:00
Bartłomiej Dach
275b86cd3c
Fix strict tracking mod not populating path progress for ticks/repeats
Closes https://github.com/ppy/osu/issues/30237.

This is the root failure in the issue, and one that *only* presents when
another conversion mod that repositions the objects is also active. That
makes the `PathProgress` of the nesteds to be zero, therefore making
them occupy the position of the slider head after any mutation to the
path.
2024-10-14 14:26:27 +02:00
Bartłomiej Dach
cd59b93cc9
Merge branch 'master' into feat/optimize-polygon-tool 2024-10-14 08:28:30 +02:00
jhk2601
1a142ff944 minor changes 2024-10-14 01:54:02 -04:00
finadoggie
6bcfed8963
Revert "remove score debugging code I accidentally left in"
This reverts commit 5192599543.
2024-10-12 16:53:32 -07:00
finadoggie
5192599543
remove score debugging code I accidentally left in 2024-10-12 16:45:34 -07:00
finadoggie
88af57818c
only assign countLargeTickMiss for slider accuracy scores
helps indicate it should only be used for slider acc scores
2024-10-12 15:36:42 -07:00
finadoggie
29b1697a70
consolidated if statements for getting effectiveMissCount and countSliderEndsDropped 2024-10-12 15:34:04 -07:00
finadoggie
3ac6a9f0ae
Join variable assignments with declarations 2024-10-12 15:30:02 -07:00
finadoggie
3b517e03aa
Convert estimateSliderEndsDropped assignment into '?:' expression
I would just like to say that I don't know why anyone would ever want this but github told me to do it
2024-10-12 01:08:39 -07:00
finadoggie
b921424461
Update to use variable usingClassicSliderAccuracy 2024-10-12 01:00:15 -07:00
Fina
3d7f4aec99
Merge branch 'ppy:master' into estimation-removal 2024-10-12 00:44:13 -07:00
jhk2601
4d367515dc Smoother size changing using linear interpolation 2024-10-11 21:52:13 -04:00
jhk2601
0794fc61a0 Initial Implementation (working, unsafe handling of cursor position) 2024-10-11 18:38:53 -04:00
Marvin Schürz
40339b8a17 Fix typo 2024-10-11 23:49:52 +02:00
Marvin Schürz
767ded4326 Restore previous NewCombo state when adding objects 2024-10-11 23:41:57 +02:00
Marvin Schürz
f76a2d02f6 Make sure to properly update hitobjects 2024-10-11 23:22:15 +02:00
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
Dean Herbert
682023e130
Merge branch 'master' into grids-4 2024-10-08 16:26:42 +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
Bartłomiej Dach
1af464d5ae
Bump difficulty calculator versions
In order for the new star difficulty to be shown to users on the next
release.

catch's difficulty calculator version is not bumped because the only
catch change pending deploy is https://github.com/ppy/osu/pull/28353 and
that affects performance points only.
2024-10-07 15:38:41 +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
OliBomby
d7526be243 Merge remote-tracking branch 'upstream/master' into grids-4 2024-10-07 11:56:35 +02:00
Bartłomiej Dach
f30ac5d996
Merge branch 'master' into no-combo-scaling 2024-10-07 11:50:58 +02:00
Bartłomiej Dach
9a8a5cd45d
Merge pull request #27063 from tsunyoku/account-for-sliders-in-accuracy-pp
Include sliders in accuracy pp if slider head accuracy is in use
2024-10-07 11:50:46 +02:00
Dean Herbert
5cb106e8e6
Merge pull request #30134 from bdach/center-button-breakage
Fix "Center on selected object" button not changing grid coordinates
2024-10-07 18:12:19 +09:00
Bartłomiej Dach
707c237acc
Merge branch 'master' into account-for-sliders-in-accuracy-pp 2024-10-07 10:51:41 +02:00
Bartłomiej Dach
2b5ddddf4f
Fix "centre on selected object" button not respecting precision of allowable grid positions 2024-10-07 10:29:45 +02:00
Bartłomiej Dach
04c65ad919
Fix "centre on selected object" sometimes remaining disabled after moving grid 2024-10-07 10:29:18 +02:00
Bartłomiej Dach
3da59f44b5
Fix clicking "centre on selected object" button not updating slider state 2024-10-07 10:29:09 +02:00
Bartłomiej Dach
f47b8d5eb6
Merge branch 'slight-rebalance' into rhythm-fixes 2024-10-07 09:30:16 +02:00
Bartłomiej Dach
6507e3e406
Merge branch 'master' into rhythm-fixes 2024-10-07 09:29:51 +02:00
Dean Herbert
1ab02b93b3
Merge branch 'master' into grids-4 2024-10-07 15:42:23 +09:00
Bartłomiej Dach
77f32708e0
Merge pull request #29980 from tsunyoku/speed-distance-hotfix
Various speed distance difficulty calculation changes
2024-10-07 08:31:52 +02:00
Dean Herbert
af43b368ea
Merge pull request #30114 from bdach/form-slider-bar-transfer-value-on-commit
Fix difficulty settings sliders attempting to reprocess all hitobjects on every instantaneous change
2024-10-07 14:59:48 +09:00
Dan Balasescu
b977a187e5
Merge pull request #30021 from bdach/fix-random-mod-broken-sr
Fix broken star rating on Random mod
2024-10-07 14:54:55 +09:00
Bartłomiej Dach
1854e1c2f9
Merge branch 'master' into form-slider-bar-transfer-value-on-commit 2024-10-07 07:21:23 +02:00
Bartłomiej Dach
8496005e47
Merge pull request #30088 from stanriders/uncap-od-accuracy
Uncap speed OD-accuracy scaling
2024-10-07 07:15:03 +02:00
OliBomby
cc29e8c16d introduce tooltip to rounded button with subclass instead 2024-10-05 15:16:29 +02:00
StanR
d4a00d75e8
Update osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
Co-authored-by: James Wilson <tsunyoku@gmail.com>
2024-10-04 17:42:15 +05:00
James Wilson
7cfc389d03
remove double-negative on usingClassicSliderHeadAccuracy 2024-10-04 13:37:05 +01: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
tsunyoku
f54a5a5b0e Merge branch 'master' into no-combo-scaling 2024-10-03 16:37:20 +01:00
Bartłomiej Dach
1bab2236fe
Ensure columns collapse into one correctly if no space 2024-10-03 15:01:23 +02:00
Bartłomiej Dach
99eb26b7d5
Redo the layout of sections based on discord feedback
See
https://discord.com/channels/188630481301012481/188630652340404224/1291358770064130140
and everything after.
2024-10-03 13:53:21 +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
StanR
87835f2481 Uncap speed od accuracy scaling 2024-10-02 19:47:22 +05: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
Bartłomiej Dach
31d1ba4949
Remove unused member 2024-09-30 09:30:06 +02:00