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

44524 Commits

Author SHA1 Message Date
Shin Morisawa
7dff243e6a
use .ToFormattedDuration 2024-11-14 16:59:03 +09:00
Shin Morisawa
64e7e44f28
fix issue 2024-11-14 16:33:52 +09:00
Shin Morisawa
53fcb494ff
Merge branch 'ppy:master' into 1hour-song-multi 2024-11-14 16:32:24 +09:00
Bartłomiej Dach
02e4907fb6
Merge pull request #29896 from OliBomby/hs-toggle2
Collapse sample point indicators into dots if they cannot be displayed in full
2024-11-14 08:28:11 +01:00
Dean Herbert
7f8eebc510
Merge pull request #30578 from smoogipoo/beatmap-legacy-object-type
Simplify convertible hitobject parsing and add `IHasLegacyHitObjectType`
2024-11-14 16:16:44 +09:00
Dean Herbert
d37c1bb6d0
Remove redundant null initialisation and apply nullability 2024-11-14 13:37:58 +09:00
Dean Herbert
7670a81181
Merge branch 'master' into bat-max-performance 2024-11-14 13:35:29 +09:00
Shin Morisawa
a3da10ff44
fixed said issue 2024-11-14 07:19:18 +09:00
Shin Morisawa
7e96ae6da4
change stuff. (idk what exactly) 2024-11-14 06:58:54 +09:00
Dan Balasescu
85d292ae57
Merge pull request #30602 from peppy/increase-idle-time
Increase idle time before gameplay loads when hovering controls
2024-11-13 21:21:23 +09:00
Dean Herbert
68945daa40
Add confirmation when pressing 'q' to quit at the main menu
Kinda a weird key. I feel like this deserves a confirmation step unlike
mouse clicking the exit button.

Addresses https://github.com/ppy/osu/discussions/30471.
2024-11-13 19:27:20 +09:00
Dean Herbert
b82f420b52
Merge pull request #30433 from stanriders/fix-userpanel-overflow
Fix `UserRankPanel` rank overflowing on 6+ digits
2024-11-13 19:19:30 +09:00
Dean Herbert
54ca705680
Merge branch 'master' into hs-toggle2 2024-11-13 19:15:00 +09:00
Dan Balasescu
60d45d44bb
Merge pull request #30536 from stanriders/add-diffcalc-helpers
Add `DifficultyCalculationUtils`
2024-11-13 17:49:40 +09:00
Dean Herbert
2ae8c36d17
Increase idle time before gameplay loads when hovering controls 2024-11-13 17:39:21 +09:00
Dean Herbert
78084e33af
Merge pull request #30411 from frenzibyte/editor-slider-touch-support-2
Fix placing objects via touch in editor not working sometimes
2024-11-13 15:09:57 +09:00
Bartłomiej Dach
c25215d2cf
Merge pull request #30579 from peppy/fix-rank-display-song-select
Fix top rank display not showing up on beatmaps with many difficulties
2024-11-12 12:26:26 +01:00
Dan Balasescu
678d14aa60
Merge pull request #30534 from Lawtrohux/difficult-strain
Globalise `CountDifficultStrains` within StrainSkill
2024-11-12 14:50:18 +09:00
Dean Herbert
8c5785fdf6
Make math more logical 2024-11-11 22:57:26 +09:00
Dean Herbert
ee4d58544d
Update framework (and other common packages) 2024-11-11 21:58:13 +09:00
Bartłomiej Dach
b430ac2214
Merge branch 'master' into song-select-less-semi-opaque 2024-11-11 11:04:48 +01:00
Bartłomiej Dach
d29dd2c223
Remove unused using directives 2024-11-11 11:04:43 +01:00
Bartłomiej Dach
c37e4877e2
Move setting back to timing panel 2024-11-11 10:08:26 +01:00
Dean Herbert
f84ee3996f
Reduce semi-opaque layers at song select
I made these changes while working on
https://github.com/ppy/osu/pull/30579. Basically, it's hard to fix the
ranks not loading while underneath the footer, and the transparency both
looks bad, and is going away in the redesign.

I've chosen values here that are moving *in the direction* of the new
design without overhauling everything.

- I know that there's still some transparency. I did this because it
helps keep all current elements / colours contrasting without too much
effort.
- I completely removed the transparency adjustments on the beatmap
panels. This always looked bad due to being applied per-layer, and I
don't think it added much.
2024-11-11 17:57:23 +09:00
Bartłomiej Dach
0cddb93dda
Move setting to user config 2024-11-11 09:57:17 +01:00
Bartłomiej Dach
a6cdf6df07
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm 2024-11-11 09:50:00 +01:00
Dean Herbert
e8b69581b7
Fix top rank display not showing up on beatmaps with many difficulties 2024-11-11 17:49:34 +09:00
Dean Herbert
f8ac54d61c
Fix weird local variable typo 2024-11-11 16:59:02 +09:00
Dan Balasescu
8c68db0a36
Remove unused params 2024-11-11 16:10:15 +09:00
Dan Balasescu
7206e97b7b
Add IHasLegacyHitObjectType to ConvertHitObject 2024-11-11 16:10:15 +09:00
Dan Balasescu
e1d93a7d9c
Merge implementations of ConvertHitObjectParser
Having these be separate implementations sounded awesome at the time,
but it only ever led to confusion. There's no practical difference if,
for example, catch sees hitobjects with `IHasPosition` instead of
`IHasXPosition`.
2024-11-11 15:09:13 +09:00
Dean Herbert
322df72cce
Merge pull request #30425 from bdach/multiplayer-song-select-wyd
Fix multiplayer song select not correctly applying filter sometimes
2024-11-11 14:54:48 +09:00
Dean Herbert
caedbdeccf
Merge pull request #30545 from bdach/fix-restore-storage-not-restoring-storage
Fix retry button on storage unavailable dialog not reopening realm if retry succeeds
2024-11-11 14:30:50 +09:00
Joseph Madamba
9acfb3c900
Fix break overlay grades not using localised string 2024-11-09 16:45:18 -08:00
Bartłomiej Dach
091d02b3a8
Fix retry button on storage unavailable dialog not reopening realm if retry succeeds
Related: https://github.com/ppy/osu/issues/30539

When starting up the game with a data location that points to an
unavailable external device, a new realm file is created in the default
location. Eventually a popup is shown that informs the user that the
external storage is unavailable, and the user has an option to try the
storage again. The button that invokes said option would check said
storage correctly, but would not do anything about realm, which means
the previously opened empty realm that is placed in the default location
would remain open, which means the retry essentially doesn't work
because the user's stuff isn't there after the retry.

To fix this, take out a `BlockAllOperations()`, which will flush all
open realms, and re-open the realm on the external location if the
custom storage restore succeeds.
2024-11-08 09:28:14 +01:00
StanR
c9d3b6557d Fix code issues 2024-11-07 21:23:26 +05:00
StanR
78c97d2cd7 Add DifficultyCalculationUtils 2024-11-07 20:36:00 +05:00
Bartłomiej Dach
b0c6042b2a
Fix HUD elements shifting in unintended manner when partially off-screen flipped skin elements are present
Closes https://github.com/ppy/osu/issues/30286.
2024-11-07 14:01:34 +01:00
Jay Lawton
7c3a3c4d10 rename DifficultStrains for clarity 2024-11-07 21:56:42 +10:00
Jay Lawton
2b6a473164 update methods 2024-11-07 21:12:04 +10:00
Dean Herbert
54288c350a
Merge pull request #30525 from smoogipoo/multiplayer-refactor
Replace `MultiplayerRoomComposite` with local bindings
2024-11-07 19:53:44 +09:00
Jay Lawton
a5e6da76cb introduce difficult strains globally 2024-11-07 19:53:53 +10:00
Dean Herbert
c7d0a7dde2
Update xmldoc and make realm transactions more obvious 2024-11-07 18:31:06 +09:00
Dan Balasescu
bd630c189e
Fix tests not working by forgoing beatmap updates 2024-11-07 17:26:10 +09:00
Dean Herbert
da95a1a2f1
Update resources 2024-11-06 18:54:52 +09:00
Dean Herbert
366c0f664f
Merge branch 'master' into ruleset-selection-duck-tweak 2024-11-06 18:54:48 +09:00
Dan Balasescu
788ecc1e7b
Replace MultiplayerRoomComposite with local bindings 2024-11-06 15:31:27 +09:00
Bartłomiej Dach
2699ebb50d
Merge pull request #30505 from peppy/editor-hide-breaks
Add ability to hide breaks from timeline
2024-11-06 06:54:49 +01:00
Bartłomiej Dach
23f3890293
Fix effect point scroll speeds below 0.1x not being encoded properly
Closes https://github.com/ppy/osu/issues/30472.

Caused by mismatching bounds between

	2bd12e14db/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs (L22-L26)

and

	2bd12e14db/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs (L21-L28)
2024-11-05 11:56:19 +01:00
Bartłomiej Dach
2bd12e14db
Merge pull request #30467 from cdwcgt/friend-add
Add the ability to add/remove friends in `UserProfileHeader`
2024-11-05 10:25:27 +01:00