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

15403 Commits

Author SHA1 Message Date
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
d7526be243 Merge remote-tracking branch 'upstream/master' into grids-4 2024-10-07 11:56:35 +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
OliBomby
ae8abc7f35 fix readybutton and favouritebutton 2024-10-05 21:46:00 +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
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
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
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
Bartłomiej Dach
b15608343b
Replace setup screen controls with new "form" controls 2024-10-03 11:49:03 +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
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
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
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
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
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
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)

A way to defend against this is a clone, but this reveals another issue,
in that the existing code was *relying* on the reference to the mod
remaining the same in any other case, to read the latest valid settings
of the mod. This basically only mattered in the edge case wherein Double
Time would swap places with Half Time and vice versa (think [0.95,1.05]
range). Therefore, track mod settings too explicitly to ensure that the
stored clone is as up-to-date as possible.
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
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
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
Bartłomiej Dach
b45fedc356
Merge branch 'master' into control-drag 2024-09-27 11:39:50 +02:00
Bartłomiej Dach
a00ed8dd77
Merge pull request #29914 from peppy/fix-judgement-counter-sync
Fix judgement counter not showing correct counts when spectating user mid-play
2024-09-27 10:57:26 +02:00
Bartłomiej Dach
33593280d8
Merge pull request #29938 from OliBomby/selection-center
Use minimum enclosing circle as selection centre for scale and rotate
2024-09-27 10:46:32 +02:00
Bartłomiej Dach
766d2d2ad2
Merge pull request #29950 from minetoblend/feature/freeze-select-box-buttons
Freeze select box buttons position on press
2024-09-27 10:13:06 +02:00
Dan Balasescu
73a9b03401
Merge pull request #30018 from peppy/add-missing-shader-preload
Update shader preloader with missing shader usages
2024-09-27 16:58:15 +09:00
Dean Herbert
1dd6082aa9
Rename method to be more appropriate 2024-09-27 16:56:22 +09:00