1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 20:22:58 +08:00
Commit Graph

15850 Commits

Author SHA1 Message Date
Dean Herbert
4924a35c31
Fix light expiry 2024-12-20 14:46:21 +09:00
Dean Herbert
22f3831c0d
Add logo hat 2024-12-20 14:46:21 +09:00
Dean Herbert
0954e0b032
Add seasonal lighting
Replaces kiai fountains for now.
2024-12-20 14:46:20 +09:00
Dean Herbert
024029822a
Add christmas intro 2024-12-20 14:46:20 +09:00
Dean Herbert
618a9849e3
Increase intro time allowance to account for seasonal tracks with actual long intros 2024-12-20 14:46:20 +09:00
Dean Herbert
a4bf29e98f
Adjust menu logo visualiser to use seasonal colours 2024-12-20 14:19:12 +09:00
Dean Herbert
180a381b6f
Adjust menu side flashes to be brighter and coloured when seasonal active 2024-12-20 14:19:12 +09:00
Dean Herbert
80ae7942df
Add christmas-specific logo heartbeat 2024-12-20 14:19:12 +09:00
Dean Herbert
55dff1f0ef
Merge branch 'master' into skinnable-mod-display 2024-12-20 14:08:51 +09:00
Dean Herbert
7c1482366d
Remove unused using statements 2024-12-20 14:07:27 +09:00
Bartłomiej Dach
2cab8f4e8a
Add localisation support 2024-12-19 15:03:55 +01:00
Bartłomiej Dach
e458f540ac
Adjust formatting 2024-12-19 14:54:57 +01:00
Bartłomiej Dach
7d1473c5d0
Simplify expand/contract code 2024-12-19 14:52:27 +01:00
Bartłomiej Dach
772ac2d326
Fix mod display not fading out after start of play
This was very weird on master - `ModDisplay` applied a fade-in on the
`iconsContainer` that lasted 1000ms, and `HUDOverlay` would stack
another 200ms fade-in on top if a replay was loaded. Moving that first
fadeout to a higher level broke fade-out because transforms got
overwritten.
2024-12-19 14:48:18 +01:00
Dean Herbert
47d81e7dee
Fix null inspections on GameplayChatDisplay 2024-12-17 19:10:09 +09:00
Dean Herbert
bdd417c1a1
Move "global" scroll-adjusts-volume to a per-screen component-based implementation 2024-12-16 15:21:07 +09:00
Dean Herbert
85ada3275b
Skip the pause cooldown when in intro / break time
Had a quick look at adding test coverage in `TestScenePause` but the
setup to get into either of these states seems a bit annoying..
2024-12-16 14:14:30 +09:00
Bartłomiej Dach
9652c5a7ca
Merge pull request #31110 from peppy/timing-current-point-indicator
Change the way "current" points are hinted on timing screen
2024-12-16 13:27:06 +09:00
Bartłomiej Dach
573d709fae
Merge pull request #31109 from peppy/fix-editor-timing-undo-redo
Fix adjusting control point offset after undo/redo causing catastrophic failure
2024-12-16 12:40:22 +09:00
Bartłomiej Dach
98e8d0b497
Merge branch 'master' into timing-current-point-indicator 2024-12-16 12:22:14 +09:00
Bartłomiej Dach
1058abb4ab
Fix code quality 2024-12-16 12:22:06 +09:00
Bartłomiej Dach
a6e00d6eac
Implement ability to mark beatmap as played
Reported at https://osu.ppy.sh/community/forums/topics/2015478?n=1.

Would you believe it that this button that has been there for literal
years never did anything?

Implemented at a per-beatmap level. Also additionally added to context
menu (at @peppy's suggestion), and also copy reworded from "Delete from
unplayed" to "Mark as played" because double negation hurt my tiny
brain.
2024-12-16 10:49:19 +09:00
Dean Herbert
c93b6dba2b
Merge pull request #31108 from peppy/quick-retry-for-replays
Allow using "quick retry" shortcut in more cases from results screen
2024-12-13 08:18:59 -08:00
Dean Herbert
9025103b8b
Reword comment to hopefully be more understandable 2024-12-13 20:02:17 +09:00
Dean Herbert
da840e3fac
Change the way "current" points are hinted on timing screen
I actually thought things were bugged with the previous display method,
since the hinting was very similar to the hover colour/state.

I've adjusted this to hopefully give users a better idea of what this is
intending to show them.
2024-12-13 19:45:18 +09:00
Dean Herbert
64555debc2
Fix adjusting control point offset after undo/redo causing catastrophic failure
Closes https://github.com/ppy/osu/issues/31098.

Low effort fix because it was already half broken. The test was testing
in isolation but in actual editor usage it wasn't working as expected.
2024-12-13 19:33:51 +09:00
Dan Balasescu
35c70ceb18
Merge pull request #31106 from peppy/player-settings-fix-overlap-skins
Fix player settings overlay cog overlapping skin elements
2024-12-13 19:30:39 +09:00
Dean Herbert
4b0cdd761d
Add note about player settings overlay button 2024-12-13 18:58:20 +09:00
Dean Herbert
d00bc4bdd1
Also allow using "quick retry" for other replays 2024-12-13 18:14:45 +09:00
Dean Herbert
0e0d96829f
Fix "quick retry" hotkey not working for autoplay 2024-12-13 18:08:29 +09:00
Dean Herbert
a796af9511
Fix player settings overlay cog overlapping skin elements
This brings it down to be in line with the flowing elements that usually
do their best to not get in the way.

Decided against putting it in the `HUDOverlay` flow for simplicity. It
will work fine until it doesn't.
2024-12-13 17:28:15 +09:00
Dean Herbert
1e809c7f16
Fix player settings overlay appearing while in skin editor 2024-12-13 17:18:34 +09:00
Dean Herbert
313de33986
Adjust padding to avoid wrapping on checkbox text 2024-12-13 15:42:30 +09:00
Bartłomiej Dach
0328708889
Store value of toggle to setting 2024-12-12 15:17:39 +09:00
Bartłomiej Dach
61ee830588
Adjust copy 2024-12-12 15:17:39 +09:00
Bartłomiej Dach
d8d5a00f3b
Merge branch 'master' into filter-playing-rooms 2024-12-12 13:06:22 +09:00
Bartłomiej Dach
88241d5b95
Merge pull request #30838 from smoogipoo/better-room-status
Improve multiplayer room status handling
2024-12-12 13:05:59 +09:00
Dean Herbert
862b41c38e
Move BeatmapInfoWedgeV2 to correct namespace 2024-12-12 12:53:05 +09:00
Dean Herbert
e8c0e27cc0
Adjust in line with upstream changes 2024-12-11 18:17:59 +09:00
Dean Herbert
0aa17a905b
Increase timed update frequency and add inline comment 2024-12-11 18:08:34 +09:00
Dean Herbert
a3998fbd52
Merge branch 'master' into better-room-status 2024-12-11 18:06:55 +09:00
Bartłomiej Dach
4e4a99decc
Merge pull request #31076 from peppy/beatmap-store-interface
Access beatmap store via abstract base class
2024-12-11 17:48:32 +09:00
Dean Herbert
2a4f596f90
Merge branch 'master' into ios-beatmap-export 2024-12-10 23:59:15 -08:00
Dean Herbert
a868c33380
Remove BeatmapCarousel testing backdoor 2024-12-11 16:28:51 +09:00
Dean Herbert
c94b393e30
Access beatmap store via abstract base class
The intention here is to make things more testable going forward.
Specifically, to remove the "back-door" entrance into `BeatmapCarousel`
where `BeatmapSets` can be set by tests and bypas/block realm retrieval.
2024-12-11 16:28:51 +09:00
Dean Herbert
bab9b9c937
Remove no-longer-correct comment 2024-12-11 16:28:50 +09:00
Dean Herbert
de31a48beb
Some Carousel classes can be abstract 2024-12-11 16:28:50 +09:00
Bartłomiej Dach
89e3c551ff
Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files
Allow choosing different background/audio files for individual difficulties
2024-12-11 14:12:58 +09:00
Bartłomiej Dach
b37a06c0fe
Hide "show playing rooms" toggle when in filter mode it doesn't make sense with 2024-12-11 13:24:54 +09:00
Bartłomiej Dach
3352571f2a
Add ability to filter out currently playing rooms
Addresses https://osu.ppy.sh/community/forums/topics/2013293?n=1.
2024-12-11 13:24:08 +09:00
Bartłomiej Dach
637fe07b31
Rename Room{Status -> Mode}Filter
I need the "status" term free for an upcoming change. And web calls this
parameter "mode" as well:

	642e973f91/app/Models/Multiplayer/Room.php (L184-L199)

so it works in my head.
2024-12-11 12:36:42 +09:00
Salman Alshamrani
e6e79cbd11
Merge branch 'master' into silly-thing 2024-12-10 03:00:53 -05:00
Dean Herbert
bbaa542d4a
Add note about expensive operation 2024-12-10 16:45:26 +09:00
Dean Herbert
3cac583754
Rewrite resource changing code to be more legible (to my eye) 2024-12-10 16:45:26 +09:00
Dean Herbert
d69f5fd4cf
Avoid beatmap lookup per bar in logo visualisation
Just noticed in passing.
2024-12-10 14:45:36 +09:00
Dean Herbert
7ec2d91e14
Merge branch 'master' into editor-multiple-background-audio-files 2024-12-10 14:19:55 +09:00
Salman Alshamrani
e9868c6318 Enable exporting beatmaps in iOS 2024-12-09 07:47:28 -05:00
Bartłomiej Dach
459533aba6
Merge branch 'master' into bookmarks 2024-12-07 22:22:04 +09:00
Thomas Müller
0a00f7a7c2 Implement skinnable mod display
Also makes the mod display initialization sequence (start expanded, then
unexpand) controlled by HUDOverlay rather than mod display itself. This
enabled different treatment depending on whether the mod display is
viewed in the skin editor or in the player.

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-12-07 12:06:33 +09:00
Dean Herbert
5849a69a86
Merge pull request #30921 from huoyaoyuan/netcore-analyzer
Set up-to-date .NET code quality analyzers
2024-12-06 17:29:09 -08:00
Dean Herbert
8d0e1f9d18
Merge branch 'master' into improve-menu-sample-playback 2024-12-05 21:07:03 +09:00
Huo Yaoyuan
d92ea910cf Merge branch 'master' into netcore-analyzer 2024-12-05 17:18:56 +08:00
Dean Herbert
791416c8f1
Merge pull request #30937 from frenzibyte/fix-quick-restart-not-saving-score
Fix score no longer being saved when quick-restarting after pass
2024-12-04 23:48:18 -08:00
Salman Alshamrani
a7586c52d0
Merge branch 'master' into results-screen-quick-retry-transition 2024-12-04 06:31:14 -05:00
Salman Alshamrani
fa87df6c6a Move non-current handling to PerformExit
Co-authored-by: Dean Herbert <pe@ppy.sh>
2024-12-04 04:55:55 -05:00
Salman Alshamrani
8e0f6fc12d Re-encode difficulties on resource change 2024-12-04 04:36:00 -05:00
Salman Alshamrani
60d91bada8 Merge branch 'master' into editor-multiple-background-audio-files 2024-12-04 04:31:15 -05:00
Dan Balasescu
ad4df82593
Improve multiplayer listing search by making it fuzzy 2024-12-04 16:26:36 +09:00
Dean Herbert
a4d58648e2
Fix quick retry transition from results screen 2024-12-04 14:31:39 +09:00
Bartłomiej Dach
d60b7f4798
Implement basic bookmark support in editor 2024-12-03 15:14:22 +01:00
Bartłomiej Dach
808934581f
Move bookmarks out of BeatmapInfo
Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473...
2024-12-03 14:17:14 +01:00
Dan Balasescu
be05f2a1c2
Merge pull request #30929 from timschumi/rate-change-ready
Account for rate changing mods when disabling the "Ready" button
2024-12-03 16:30:16 +09:00
Tim Schumacher
e920cfa187 Move rate-changing TODO to a common place in CalculateRateWithMods 2024-12-02 23:49:51 +01:00
Bartłomiej Dach
b505ecc7ba
Do not deselect objects when control-clicking without hitting anything
As per feedback in
https://discord.com/channels/90072389919997952/1259818301517725707/1310270647187935284.
2024-12-02 13:51:43 +01:00
Bartłomiej Dach
6c0ccc5ebe
Merge pull request #30863 from frenzibyte/improve-back-button-display
Delay back button appearance when performing a quick restart
2024-12-02 11:49:45 +01:00
Bartłomiej Dach
52b8753a12
Merge pull request #30749 from Sheppsu/multi-spectator-settings-sidebar
Add player settings to multi spectator screen
2024-12-02 11:34:57 +01:00
Dean Herbert
5b2558cec2
Merge pull request #28473 from bdach/beatmap-info-purge
Move unnecessary properties from `BeatmapInfo` / realm to `IBeatmap`
2024-12-02 16:19:12 +09:00
Dean Herbert
23522b02d8
Use local instead of field for local only usage 2024-12-01 19:53:57 +09:00
Dean Herbert
6afe083ec9
Fix settings showing up during gameplay 2024-12-01 18:44:26 +09:00
Dean Herbert
ddac71628d
Merge branch 'master' into multi-spectator-settings-sidebar 2024-12-01 18:33:46 +09:00
Salman Alshamrani
53dce83b56 Fix restarting no longer working from results screen
Thanks to tests for pointing that out :blobsweat:
2024-12-01 02:13:20 -05:00
Salman Alshamrani
9140893249 Fix score no longer being saved when quick-restarting after pass 2024-11-30 23:36:02 -05:00
Tim Schumacher
164b809c89 Document ready button enable state with some comments 2024-11-30 23:02:22 +01:00
Tim Schumacher
f4e155bfa6 Account for rate changing mods when disabling the "Ready" button 2024-11-30 16:01:32 +01:00
Huo Yaoyuan
fa3c95c296 Merge branch 'master' 2024-11-30 01:07:08 +08:00
Dean Herbert
f56b2b9aef
Merge pull request #30793 from bdach/close-playlists
Add ability to close playlists within grace period after creation
2024-11-29 22:37:32 +09:00
Dean Herbert
58efed4ebe
Merge pull request #30915 from bdach/extension-checks
Centralise supported file extensions to one helper class
2024-11-29 20:55:28 +09:00
Bartłomiej Dach
5f092811cb
Use helper in one more place 2024-11-29 09:22:29 +01:00
Bartłomiej Dach
5a9127dfc6
Accidentally a word 2024-11-29 08:46:08 +01:00
Bartłomiej Dach
110e4fbb30
Centralise supported file extensions to one helper class
As proposed in
https://github.com/ppy/osu-server-beatmap-submission/pull/5#discussion_r1861680837.
2024-11-29 08:42:45 +01:00
Dean Herbert
b697ddc6db
Simplify the dev footer display 2024-11-29 15:32:35 +09:00
Salman Alshamrani
489d7a30ec Perform a single Save call rather than doing it in each difficulty 2024-11-28 18:37:13 -05:00
Salman Alshamrani
311f0947e4 Abstractify resource change logic and share between background and audio 2024-11-28 17:57:47 -05:00
Salman Alshamrani
932afcde01 Make editor make sense 2024-11-28 17:43:32 -05:00
Jamie Taylor
58cf1c11e4
Improve menu/context-menu sample playback 2024-11-29 06:54:48 +09:00
Bartłomiej Dach
c93c549b05
Fix ready button not disabling on playlist close 2024-11-28 14:17:31 +01:00
Bartłomiej Dach
9926ffd326
Make button a little narrower 2024-11-28 14:06:12 +01:00
Bartłomiej Dach
ac2c4e81c7
Use switch 2024-11-28 14:04:39 +01:00
Bartłomiej Dach
2e6f43a75d
Merge branch 'master' into close-playlists 2024-11-28 14:01:36 +01:00
Huo Yaoyuan
f5a7716509 Apply minor performance rules 2024-11-28 20:41:44 +08:00