1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Commit Graph

13032 Commits

Author SHA1 Message Date
Dean Herbert
b0501c4e5c Actually use paused header 2023-05-29 10:24:59 +09:00
Robin Oger
cfa1280028 GameplayMenuOverlay.cs: add translatable strings for Retry count: and Song progress:
This makes the assumption that languages will prefer having the number on the right
2023-05-27 12:47:05 +02:00
Robin Oger
a01577cba5 Adapt changes to fit master 2023-05-27 12:29:14 +02:00
Bartłomiej Dach
574ecf939c
Merge pull request #23647 from peppy/pause-screen-progress
Show current progress on pause screen
2023-05-26 19:36:30 +02:00
Dean Herbert
725734bc03
Merge pull request #23649 from peppy/keep-selection-buttons-on-screen
Ensure editor selection buttons remain on screen when selection is near edge
2023-05-26 20:51:45 +09:00
Dean Herbert
6b0e215246 Add (int) flooring and handle potential NaN value 2023-05-26 20:44:13 +09:00
Bartłomiej Dach
96fe7cbe54
Merge branch 'master' into sample-set-controls 2023-05-25 21:58:16 +02:00
Bartłomiej Dach
7d8f08c0ea
Fix ComposeBlueprintContainer briefly assigning auto bank
Seems to have had no consequence due to the way
`AutomaticBankAssignment` works (that flag is checked in
`PlacementBlueprint.UpdateTimeAndPosition()`, which runs essentially
every frame), but let's avoid putting it there at all ever.
2023-05-25 21:49:29 +02:00
Bartłomiej Dach
b9be886ae1
Merge branch 'master' into pause-screen-progress 2023-05-25 20:34:11 +02:00
Bartłomiej Dach
6425a33b45
Merge branch 'master' into beatmap-length-calcualtions 2023-05-25 17:44:15 +02:00
Bartłomiej Dach
b59f4aee99
Merge pull request #23660 from peppy/simplify-deselect
Fix crash when deleting dragged object in skin editor
2023-05-25 17:27:41 +02:00
Bartłomiej Dach
3ad5f8b9c9
Polish a few extreme edge cases 2023-05-25 16:39:54 +02:00
Dean Herbert
949de35664 Ensure selection is reset after immediately deleting objects
Closes https://github.com/ppy/osu/issues/23518.
2023-05-25 23:20:32 +09:00
Bartłomiej Dach
beeca5a8dd
Use alternative layouting implementation 2023-05-25 16:17:44 +02:00
Dean Herbert
a6a380dd41
Merge branch 'master' into organize-room-pills 2023-05-25 19:57:28 +09:00
Dean Herbert
609c7227ee Fix changes to font weight in a couple of combined implementations 2023-05-25 19:55:11 +09:00
Dean Herbert
1049257b56 Simplify SelectionHandler's DeselectAll implementation
We are already doing other operations in this class directly on `SelectedItems`, so might as well change this one to match
2023-05-25 18:46:31 +09:00
Dean Herbert
1e14b02493 Fix bindable feedback loop 2023-05-25 17:58:38 +09:00
Dean Herbert
37c6e632d0 Switch to using new extension method for length calculations 2023-05-25 17:38:35 +09:00
Dean Herbert
cf9fda0cf2 Merge branch 'beatmap-length-calcualtions' into pause-screen-progress 2023-05-25 17:34:08 +09:00
Dean Herbert
058edb5d5f Centralise beatmap playable duration and bounds lookups 2023-05-25 17:32:48 +09:00
Bartłomiej Dach
578a0e7494
Merge branch 'master' into beat-divisor-visual-improvements 2023-05-24 22:28:26 +02:00
Bartłomiej Dach
6ec4ecfdd7
Mention fallback default in GetDivisorForBeatIndex() 2023-05-24 22:17:51 +02:00
Bartłomiej Dach
133c954c93
Merge branch 'master' into pause-screen-progress 2023-05-24 21:57:26 +02:00
Bartłomiej Dach
8b6cd1310a
Merge branch 'master' into editor-escape-deselects 2023-05-24 20:18:44 +02:00
Bartłomiej Dach
cd3602406b
Remove unused using directive 2023-05-24 18:54:48 +02:00
Dean Herbert
b14b1072c2 Allow deselecting any selection in the editor using the Back binding (escape key) 2023-05-24 19:24:14 +09:00
Dean Herbert
3b9e1e8a94 Ensure editor selection buttons remain on screen when selection is near edge
Addresses https://github.com/ppy/osu/discussions/23599.
2023-05-24 19:16:53 +09:00
Dean Herbert
79c9a48ff7 Show song progress at pause/fail screen 2023-05-24 18:36:37 +09:00
Dean Herbert
456f3005d6 Apply nullability to GameplayMenuOverlay and use TextFlowContainer for text 2023-05-24 18:28:04 +09:00
Dean Herbert
8ada8b1c8c Remove description line from pause/fail screen
These were in the designs but read pretty bad / evil. I can't think of
any text to go in their place that makes sense, so let's just nuke it.
2023-05-24 17:48:35 +09:00
Dean Herbert
3a05dffa50 Add "auto" bank selection during placement 2023-05-24 17:11:12 +09:00
Dean Herbert
fc22c75464 Don't use switch for single case statement 2023-05-24 16:14:05 +09:00
Dean Herbert
a9ba16a2be Update to support non-control-point sample changes 2023-05-24 14:20:38 +09:00
Dean Herbert
298989ffd2 Merge branch 'master' into sample-set-controls 2023-05-24 14:03:04 +09:00
Dean Herbert
561b759bf9 Tidy up implementation and ensure non-solid ticks start at zero alpha 2023-05-24 13:49:29 +09:00
Dean Herbert
8f1f1955df
Merge pull request #66 from Gyoshi/beat-divisor-visual-improvements
Add ghost ticks to exhibit current divisor on `BeatDivisorControl`
2023-05-24 13:41:48 +09:00
Joseph Madamba
067328233c
Remove OsuScreen.ApplyLogoArrivingDefaults() 2023-05-23 13:17:43 -07:00
Gyoshi
7fe19d1992 Last instead of Max divisor to match code elsewhere 2023-05-23 18:45:49 +02:00
Gyoshi
c5ef3ae181 Code styling 2023-05-23 18:44:20 +02:00
Gyoshi
b5f8093941 Use RangePadding to align mouse with slider 2023-05-23 18:16:14 +02:00
Gyoshi
7b1e8ede54 Small format 2023-05-23 15:11:27 +02:00
Gyoshi
1b32370c6a Remove duplicate code by making GetDivisorForBeatIndex method more general 2023-05-23 15:05:38 +02:00
Gyoshi
37a796306d Small format & comment 2023-05-23 14:30:35 +02:00
Johannes vd Berg
ebda35c3c9 Add ghost ticks to exhibit current divisor on BeatDivisorControl 2023-05-23 12:57:25 +02:00
Bartłomiej Dach
38b4bd8aef
Fix undo not behaving as expected sometimes 2023-05-22 22:45:39 +02:00
Bartłomiej Dach
e0b7539c2a
Fix sample changes not being applied in patcher 2023-05-22 22:45:23 +02:00
Bartłomiej Dach
f253d17a7f
Fix slider velocity changes not being applied in patcher 2023-05-22 22:19:10 +02:00
timiimit
4441718437
Merge branch 'ppy:master' into organize-room-pills 2023-05-21 16:36:53 +02:00
Bartłomiej Dach
afdddb0195
Merge pull request #23582 from peppy/placement-blueprint-timeline-combo-fixes
Fix timeline blueprint display not showing correct combo number / colour during placement
2023-05-20 15:02:55 +02:00