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

60450 Commits

Author SHA1 Message Date
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
59768c5ffd
Merge pull request from peppy/beat-divisor-visual-improvements
Update beat divisor control to show ticks in more visually correct locations
2023-05-24 23:18:25 +02: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
6392c2007c
Merge pull request from peppy/add-shadow-settings-notifications
Add shadow to notifications and settings overlays to better distinguish from other overlays
2023-05-24 21:34:14 +02:00
Bartłomiej Dach
3311d6faaa
Merge pull request from peppy/editor-escape-deselects
Allow deselecting any selection in the editor using the `Back` binding (escape key)
2023-05-24 21:18:18 +02:00
Bartłomiej Dach
8b6cd1310a
Merge branch 'master' into editor-escape-deselects 2023-05-24 20:18:44 +02:00
Bartłomiej Dach
07b5874eee
Fix test step name 2023-05-24 20:18:36 +02:00
Bartłomiej Dach
567a648e12
Merge pull request from peppy/pause-screen-cleanup
Remove flavour text from the pause / fail screens
2023-05-24 19:55:23 +02:00
Bartłomiej Dach
cd3602406b
Remove unused using directive 2023-05-24 18:54:48 +02:00
Dean Herbert
6044327181 Add test coverage for escape deselecting any active selection 2023-05-24 23:59:22 +09:00
Dean Herbert
663cec1ff6 Combine editor navigation test scenes 2023-05-24 23:51:28 +09: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
Stéén
dcfc99a092
Merge branch 'master' into make_pause_menu_translatable 2023-05-24 12:13:34 +02: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
8e5ba2208d Add test coverage of new hotkeys 2023-05-24 17:33:48 +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
a22ad98cb7 Fix hotkeys not actually working 2023-05-24 14:56:11 +09:00
Dean Herbert
a9ba16a2be Update to support non-control-point sample changes 2023-05-24 14:20:38 +09:00
Dean Herbert
e68ba6366c Update new usages of "soft" to use the new constant 2023-05-24 14:04:10 +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 from Gyoshi/beat-divisor-visual-improvements
Add ghost ticks to exhibit current divisor on `BeatDivisorControl`
2023-05-24 13:41:48 +09:00
Dean Herbert
6526688ddb
Merge pull request from Gyoshi/beat-divisor-mouse-drag-cherry-picked
Beat divisor mouse drag fix and tests
2023-05-24 13:37:34 +09:00
Dean Herbert
9869e815ce
Merge pull request from Joehuu/remove-logo-arriving-workaround
Remove `OsuScreen.ApplyLogoArrivingDefaults()`
2023-05-24 13:20:26 +09:00
Dean Herbert
e5451d1d79 Centralise definition of overlay shadow opacity and reduce slightly 2023-05-24 12:40:35 +09:00
Joseph Madamba
067328233c
Remove OsuScreen.ApplyLogoArrivingDefaults() 2023-05-23 13:17:43 -07:00
Robin Oger
d852883421 Merge remote-tracking branch 'origin/make_pause_menu_translatable' into make_pause_menu_translatable 2023-05-23 21:37:20 +02:00
Robin Oger
a24da89908 Change to sentence casing
See: https://github.com/ppy/osu/pull/23640#discussion_r1202879352
2023-05-23 21:37:12 +02:00
Stéén
b9b97069b3
Merge branch 'master' into make_pause_menu_translatable 2023-05-23 21:28:00 +02:00
Bartłomiej Dach
1671729b78
Merge pull request from peppy/fix-multiplayer-song-select-scene
Fix weird state when attempting to enter gameplay skin editor scene from multiplayer
2023-05-23 20:41:09 +02:00
Robin Oger
0ea3eea8d6 Make GameplayMenuOverlay translatable
This allows translator to translate the pause and failed in game menus
2023-05-23 19:21:44 +02: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
fa00f8b92a replace manual code with existing method 2023-05-23 18:16:12 +02:00
Gyoshi
921d7e4d89 More fitting tests for new layout 2023-05-23 18:16:10 +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
Dan Balasescu
e467791d0b
Merge pull request from peppy/fix-updates-during-gameplay
Disallow game to check for updates while gameplay is active
2023-05-23 19:04:43 +09:00
Dean Herbert
02d8e3a11e Mark FullscreenOverlay's shadow effect as Hollow to save on shader overhead 2023-05-23 18:50:14 +09:00
Dean Herbert
6f4e2b37ed Add shadow to notifications and settings overlays to better distinguish from other overlays 2023-05-23 18:50:14 +09:00