Dean Herbert
682023e130
Merge branch 'master' into grids-4
2024-10-08 16:26:42 +09:00
Dean Herbert
b658d9a681
Merge pull request #30073 from peppy/updates-outside-of-gameplay-only-2
...
Avoid updates (and update notifications) from appearing in more gameplay cases
2024-10-08 15:17:09 +09:00
OliBomby
076c8dec5a
Revert "Use new place grid icon"
...
This reverts commit db10202642
2024-10-07 19:06:32 +02:00
Dean Herbert
a02cda6528
Update resources
2024-10-08 01:51:56 +09:00
OliBomby
db10202642
Use new place grid icon
2024-10-07 16:51:53 +02:00
Bartłomiej Dach
84d6467e48
Merge branch 'master' into taikostatacc
2024-10-07 14:15:29 +02:00
OliBomby
7b998219d7
move grid placement tool to left toolbox
2024-10-07 12:04:14 +02:00
Dan Balasescu
aee5f0ebf5
Fix incorrect condition
2024-10-07 19:01:25 +09: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
Dan Balasescu
6e659e156e
Refactoring for correctness
2024-10-07 17:50:23 +09:00
OliBomby
0a7d2395d2
fix tooltip in SettingsButton
2024-10-07 10:43:24 +02:00
Dan Balasescu
8dece70097
Merge branch 'master' into updates-outside-of-gameplay-only-2
2024-10-07 17:41:42 +09:00
Dean Herbert
11fc811e2f
Fix delete dialogs having generic "Caution" header text
...
Regressed in https://github.com/ppy/osu/pull/28363 .
2024-10-07 16:46:53 +09:00
Dean Herbert
75f15ccaba
Maybe fix compilation? Fuck knows if this is correct.
2024-10-07 16:04:24 +09:00
Dean Herbert
1ab02b93b3
Merge branch 'master' into grids-4
2024-10-07 15:42:23 +09:00
Dean Herbert
5c826be652
Merge pull request #29860 from bdach/fix-nudging
...
Only allow seek to next/previous object via keybinding if there is no selection
2024-10-07 15:36:19 +09:00
Dan Balasescu
944f8f5f67
Merge pull request #30078 from CloneWith/update/progresshover
...
Add progress tooltip for ArgonSongProgressBar
2024-10-07 15:20:50 +09:00
Dean Herbert
6e4eed657c
Fix weird mouse position handling and don't return true to event
2024-10-07 14:32:31 +09:00
Dean Herbert
b5cc45bdda
Simplify format code (and adjust formatting slightly)
2024-10-07 14:26:42 +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
Dean Herbert
2bcbaed5b8
Update framework
2024-10-07 14:11:31 +09:00
Dean Herbert
5859021003
Merge pull request #30113 from bdach/fix-separator-jank
...
Fix improper handling of decimal separator in "form" number boxes / sliders
2024-10-07 13:42:02 +09:00
Dan Balasescu
72ac2eeb1d
Update osu!framework package
2024-10-06 07:54:56 +09:00
OliBomby
ae8abc7f35
fix readybutton and favouritebutton
2024-10-05 21:46:00 +02:00
OliBomby
cc29e8c16d
introduce tooltip to rounded button with subclass instead
2024-10-05 15:16:29 +02:00
OliBomby
ad734b1a13
Revert "Use new keyword instead of overriding TooltipText to remove setter"
...
This reverts commit 80dffa905a
2024-10-05 15:10:36 +02:00
CloneWith
d7ba4ce7f2
Refactor progress tooltip updating method
...
* Rewrite calculating logic
* Remove useless variables
2024-10-04 23:30:50 +08: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
Bartłomiej Dach
86c3e3e987
Replace FormSliderBar.Instantaneous with TransferValueOnCommit
...
Rather than control the propagation of the value between the slider and
the textbox, add a property that controls the propagation of the value
between the bindables inside the form control to external bindables.
This will help alleviate issues where the external bindable update
incurs overheads due to having heavy change callbacks attached.
2024-10-04 14:07:16 +02:00
Bartłomiej Dach
31aea86eab
Merge pull request #30110 from peppy/new-colour-better-ux
...
When adding a new combo colour, use the last colour as a starting point
2024-10-04 13:19:01 +02:00
Bartłomiej Dach
45a6a743a2
Fix improper handling of decimal separator in "form" number boxes / sliders
...
Spotted in passing in
https://discord.com/channels/188630481301012481/1097318920991559880/1291693852981329981 .
2024-10-04 13:12:25 +02:00
Bartłomiej Dach
96b6780e0c
Merge pull request #30101 from bdach/menu-padding-left
...
Do not add checkbox padding to the left of menu items if no item actually needs it
2024-10-04 12:22:35 +02:00
Dean Herbert
4fc0aae486
Merge pull request #30108 from bdach/default-combo-colours-in-editor
...
Initialise colours section with default combo colours if none present
2024-10-04 18:57:25 +09:00
Dean Herbert
ff2777a3b9
When adding a new combo colour, use the last colour as a starting point
...
Also opens the popover automatically because you always want to edit it.
2024-10-04 18:44:33 +09:00
Bartłomiej Dach
e136568a18
Remove linq usage to kill allocations
2024-10-04 11:25:21 +02:00
Bartłomiej Dach
61103cc712
Remove redundant initialiser
2024-10-04 11:18:09 +02:00
Bartłomiej Dach
7cd724f342
Move setup screen background preview to appropriate form control
...
See
https://discord.com/channels/188630481301012481/188630652340404224/1291361342971707463 .
2024-10-04 11:09:14 +02:00
CloneWith
fd5655455a
Adjust tooltip text format
2024-10-04 16:56:16 +08:00
CloneWith
2d7fdaf892
Override OnMouseMove for cursor position fetching
2024-10-04 16:42:48 +08:00
Bartłomiej Dach
6e5a38c6c8
Initialise colours section with default combo colours if none present
...
Closes https://github.com/ppy/osu/issues/30100 .
2024-10-04 10:01:24 +02:00
tsunyoku
f54a5a5b0e
Merge branch 'master' into no-combo-scaling
2024-10-03 16:37:20 +01:00
Bartłomiej Dach
29418226c0
Do not add checkbox padding to the left of menu items if no item actually needs it
...
RFC. As per
https://discord.com/channels/188630481301012481/188630652340404224/1291346164976980009 .
The diff is extremely dumb but I tried a few smarter methods and they're
either not fully correct or don't work. Primary problem is that menu
items are mutable externally and there's no hook provided by the
framework to know that items changed. One could probably be made but I'd
prefer that this change be examined visually first before I engage in
too much ceremony and start changing framework around.
2024-10-03 15:36:53 +02: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
090c8ee602
Make colour palette things circular again
2024-10-03 14:35:03 +02:00
Bartłomiej Dach
2c0a7d4c18
Adjust slider bar padding
...
https://discord.com/channels/188630481301012481/188630652340404224/1291374650256916482
2024-10-03 14:32:46 +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
Dean Herbert
0a0e31163b
Merge branch 'master' into editor/setup-screen
2024-10-03 20:05:08 +09:00
Dean Herbert
19356d0487
Match corner radius of "new" button
2024-10-03 19:33:48 +09:00
Bartłomiej Dach
a567c6369d
Autoselect contents of "form" number box
2024-10-03 11:49:05 +02:00
Bartłomiej Dach
cde348bfb8
Fix "form" textbox not dropping border if disabled when hovered
2024-10-03 11:49:05 +02:00
Bartłomiej Dach
09441a53c2
Fix "form" file selector displaying commit animation on initial show
2024-10-03 11:49:05 +02:00
Bartłomiej Dach
b15608343b
Replace setup screen controls with new "form" controls
2024-10-03 11:49:03 +02:00
Bartłomiej Dach
df730e6b6f
Implement "form" colour palette control
2024-10-03 11:20:47 +02:00
OliBomby
2c39ecbda3
Add xmldoc to SnapType
2024-10-03 11:16:37 +02:00
OliBomby
80dffa905a
Use new keyword instead of overriding TooltipText to remove setter
2024-10-03 11:13:49 +02:00
Dean Herbert
24d6ea5444
Change failed states to be considered as NotPlaying
2024-10-03 17:11:41 +09:00
Dean Herbert
1039d4e45d
Increase chat font size again
2024-10-03 16:23:17 +09:00
OliBomby
4bbefa360c
fix using directive
2024-10-01 15:57:34 +02:00
OliBomby
f8397cccc7
Merge remote-tracking branch 'upstream/master' into grids-4
2024-10-01 15:43:54 +02:00
OliBomby
9fa2849b14
Fixed tooltip inheritors of RoundedButton
2024-10-01 15:34:12 +02:00
OliBomby
4de73dd9c8
Reapply "Add tooltip to rounded button"
...
This reverts commit 1912b1fcf3
2024-10-01 15:28:13 +02:00
CloneWith
5dd28d5352
Fix extra newline
2024-10-01 21:08:31 +08:00
CloneWith
5af05f1cc9
Use play length for timestamp calculation
2024-10-01 20:53:15 +08:00
CloneWith
4f16ecdf1b
Add progress tooltip for ArgonSongProgressBar
2024-10-01 20:22:46 +08:00
Dean Herbert
8773c34fdd
Rename enum to non-plural now that it won't conflict
2024-10-01 19:55:46 +09:00
Dean Herbert
8dba4cf760
Passing means NotPlaying
2024-10-01 19:55:31 +09: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
Bartłomiej Dach
afc34b2614
Merge pull request #30074 from peppy/lock-because
...
Fix usage of locked context without locking
2024-10-01 12:08:38 +02:00
Dean Herbert
598bc74614
Merge pull request #30058 from bdach/disabled-beatmap-comment-box
...
Properly disable comment box on things that cannot be commented on
2024-10-01 18:52:40 +09:00
Dean Herbert
162558e0b8
Use record struct
...
See
https://www.jetbrains.com/help/rider/UsageOfDefaultStructEquality.html .
2024-10-01 18:48:34 +09:00
Dean Herbert
ae75bfd966
Rename keyboard mapping methods to make more sense now that everything's on the left
2024-10-01 18:41:53 +09:00
Dean Herbert
8f0fedbd22
Fix local scores never importing due to new conditionals
2024-10-01 18:21:15 +09:00
Bartłomiej Dach
44b982864c
Fix test failures
2024-10-01 11:12:56 +02:00
Dean Herbert
307cc5581d
Fix usage of locked context without locking
...
Raised in the latest Rider EAP, seems valid enough.
2024-10-01 18:01:06 +09:00
Dean Herbert
3d54f4a5ab
Make states better defined
2024-10-01 17:53:58 +09:00
Dean Herbert
ad3007eaad
Adjust ILocalUserPlayInfo to expose whether gameplay is in a paused/break state
2024-10-01 17:53:46 +09:00
Bartłomiej Dach
2a214f7c9f
Fix incorrect implementation of next track choice
...
`SkipWhile()` in this context does not correctly ensure that
`ElementAtOrDefault(1)` is not a protected track. An explicit `Where()`
does.
Spotted accidentally when I noticed that skipping to next track can
select a protected track, but skipping to previous cannot.
2024-10-01 10:19:59 +02:00
Bartłomiej Dach
a2d9302f4a
Move shuffle button to left side
2024-10-01 10:12:38 +02:00
Bartłomiej Dach
8eb5e6b1d5
Merge branch 'master' into shuffle
2024-10-01 10:07:54 +02:00
Bartłomiej Dach
8d2f2517a3
Specify type explicitly
2024-10-01 10:01:31 +02:00
Bartłomiej Dach
a9818854f4
Merge pull request #30024 from peppy/edit-url-decode
...
Fix editor timestamp URLs not working when they contain a space
2024-10-01 09:44:18 +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
74a9899fc0
Fix doubled-up enabled state management of commit button
2024-09-30 14:05:26 +02:00
Bartłomiej Dach
11fc1f9a1c
Fix distance snap grid using wrong colour when reference object is unsnapped
2024-09-30 13:36:51 +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
e91c8fb4bd
Properly disable comment box on beatmaps that cannot be commented on
...
Closes https://github.com/ppy/osu/issues/30052 .
Compare:
- 83816dbe24/resources/js/components/comment-editor.tsx (L54-L60)83816dbe24/resources/js/components/comment-editor.tsx (L47-L52)
2024-09-30 11:02:00 +02:00
Bartłomiej Dach
5e5bb49cd8
Fix rate change hotkeys sometimes losing track of adjust pitch setting
...
Fixes https://osu.ppy.sh/community/forums/topics/1983327 .
The cause of the bug is a bit convoluted, and stems from the fact that
the mod select overlay controls all of the game-global mod instances if
present. `ModSpeedHotkeyHandler` would store the last spotted instance
of a rate adjust mod - which in this case is a problem, because on
deselection of a mod, the mod select overlay resets its settings to
defaults:
a258059d43/osu.Game/Overlays/Mods/ModSelectOverlay.cs (L424-L425)
2024-09-30 08:47:02 +02:00
Dean Herbert
a258059d43
Merge pull request #29918 from bdach/control-drag
...
Add to existing selection when dragging with control pressed
2024-09-30 14:00:36 +09:00
Andrei Zavatski
f473f4398c
Fix text in FormFileSelector bleeding through the border
2024-09-28 22:37:16 +03:00
OliBomby
1912b1fcf3
Revert "Add tooltip to rounded button"
...
This reverts commit 3e4cd0aeac
2024-09-28 17:33:24 +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
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
Dean Herbert
9647a1be7d
Ensure editor timestamp args are URL decoded
2024-09-27 20:08:38 +09:00
Bartłomiej Dach
c1e51e05df
Merge pull request #29704 from Fabep/ModCustomisationHeaderColor
...
Mod customisation header color
2024-09-27 12:40:35 +02:00
Bartłomiej Dach
d607331755
Fix control-drag selection expansion deselecting object if control is released over one of the blueprints
2024-09-27 12:15:08 +02:00
