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

40891 Commits

Author SHA1 Message Date
Bartłomiej Dach
0ab6e18792
Automatically focus search text box on open depending on setting 2023-12-14 09:52:55 +01:00
Bartłomiej Dach
70a546b23c
Add setting for adjusting whether text search is active by default 2023-12-14 09:52:23 +01:00
Dean Herbert
e296730b37
Merge pull request #24642 from Givikap120/arod_rate_adjust
Show adjusted AR/OD when using DT/HT
2023-12-13 22:17:10 +09:00
Dean Herbert
76c4931f3a
Merge pull request #25673 from frenzibyte/fix-argon-initial-display
Fix `ArgonHealthDisplay` not displaying miss correctly during initial transition
2023-12-13 22:16:34 +09:00
Dean Herbert
c6b1a5f1ee
Merge pull request #25691 from bdach/fix-skin-editor-crash-again
Fix skin editor crashing in some circumstances when opened in main menu
2023-12-13 22:15:42 +09:00
Bartłomiej Dach
084474ef79
Merge branch 'master' into export-log-archive 2023-12-13 11:08:33 +01:00
Bartłomiej Dach
7a4ea90bda
Fix test failures due to dependency becoming required 2023-12-13 11:01:07 +01:00
Dean Herbert
8d55b3f34d
Merge pull request #25749 from smoogipoo/move-counts-to-beatmapinfo
Move object counts to BeatmapInfo
2023-12-13 17:58:13 +09:00
Dan Balasescu
8c7570525a
Merge pull request #25744 from peppy/adjust-mod-multipliers
Adjust some mod multipliers for initial leaderboard sanity
2023-12-13 17:56:13 +09:00
Dan Balasescu
812f52e793
Bump version number 2023-12-13 17:38:59 +09:00
Dean Herbert
9235f3d935
Merge pull request #25747 from peppy/fix-hit-error-clear
Fix hit error displays not clearing on seek
2023-12-13 17:36:24 +09:00
Dean Herbert
5062c53e36
Refactor everything for sanity 2023-12-13 17:33:39 +09:00
Dan Balasescu
0171078052
Move object counts to BeatmapInfo 2023-12-13 17:33:24 +09:00
Dean Herbert
9a982a9564
Tidy up GetRateAdjustedDisplayDifficulty implemetations 2023-12-13 17:13:21 +09:00
Dean Herbert
3131d37621
Clear transformations with more fire 2023-12-13 17:00:21 +09:00
Dean Herbert
9433180ffe
Fix various code quality and visual issues with AdjustedAttributesTooltip 2023-12-13 16:57:31 +09:00
Dean Herbert
fb44fb18e0
Update in line with upstream changes 2023-12-13 16:42:20 +09:00
Bartłomiej Dach
df90efdfac
Merge branch 'master' into collection-dropdown-improve-ux 2023-12-13 08:36:39 +01:00
Bartłomiej Dach
d0fccb30ec
Merge branch 'master' into export-log-archive 2023-12-13 08:36:13 +01:00
Dean Herbert
0259ab761b
Merge branch 'master' into arod_rate_adjust 2023-12-13 16:35:18 +09:00
Dean Herbert
fdcf87569c
Merge pull request #25711 from smoogipoo/mania-convert-song-select-keycount
Display osu!mania keycount in song select carousel panels and details
2023-12-13 16:31:25 +09:00
Dean Herbert
ec6200b4ad
Merge pull request #25743 from peppy/merge-everything-at-once
Merge everything at once
2023-12-13 16:17:06 +09:00
Dean Herbert
f2c6c348be
Fix HitError Clear methods not correctly returning pooled drawables 2023-12-13 16:13:23 +09:00
Dean Herbert
110749205d
Cache GameplayClockContainer to allow usage of OnSeek 2023-12-13 16:13:08 +09:00
Dan Balasescu
2abf3a55ae
Add IsLegacyScore to SoloScoreInfo 2023-12-13 16:12:12 +09:00
Dean Herbert
4983845041
Update HT mod multiplier to match stable better 2023-12-13 15:53:39 +09:00
Dean Herbert
0611a1ddc9
Avoid background processing falling over is BeatmapSet is null
See https://github.com/ppy/osu/issues/10458.
2023-12-13 15:28:54 +09:00
Dean Herbert
5e10f9f899
Fix failing tests due to more textboxes being present with searchable dropdowns 2023-12-13 15:11:47 +09:00
Dean Herbert
aa4faf5e8e
Merge pull request #25740 from smoogipoo/fix-ignoremiss-accuracy-update
Fix IgnoreMiss judgements not updating accuracy
2023-12-13 15:03:07 +09:00
Dean Herbert
eb30a603d9
Fix typo in argument name 2023-12-13 15:01:36 +09:00
Dean Herbert
996bc659e4
Adjust some mod multipliers for initial leaderboard sanity 2023-12-13 14:31:19 +09:00
Dean Herbert
0be6743e87
Apply Bindable.Parse refactorings 2023-12-13 14:07:38 +09:00
Dean Herbert
ae8a70ddfc
Merge branch 'drawnode-subtree-draw-cleanup' into dropdown-search 2023-12-13 14:03:46 +09:00
Dan Balasescu
41ba1dcfce
Merge branch 'master' into editor/checks/delayed-hitsounds 2023-12-13 14:01:06 +09:00
Dean Herbert
2579b42ac5
Update framework 2023-12-13 14:01:03 +09:00
Dean Herbert
5b00cf283d
Merge branch 'master' into drawnode-subtree-draw-cleanup 2023-12-13 14:01:01 +09:00
Dan Balasescu
6ed5613c22
Merge branch 'master' into mania-convert-song-select-keycount 2023-12-13 13:53:50 +09:00
Dan Balasescu
2930b53edd
Simplify implementation 2023-12-13 13:43:14 +09:00
Dan Balasescu
8c760e5110
Fix hitobject count when creating from an IBeatmap 2023-12-13 13:41:03 +09:00
Dan Balasescu
c31ff84417
Fix possible nullref 2023-12-13 13:32:27 +09:00
Dan Balasescu
daaadf3fc3
Fix IgnoreMiss judgements not updating accuracy 2023-12-13 11:51:45 +09:00
Salman Ahmed
67a9eab741 Update caret layout 2023-12-12 21:21:11 +03:00
Salman Ahmed
f0ddcb22c6 Remove arbitrary margin 2023-12-12 21:21:04 +03:00
Salman Ahmed
10e8edff67 Merge branch 'master' into dropdown-search 2023-12-12 21:14:01 +03:00
Dan Balasescu
987fe9322e
Merge pull request #24166 from Zyfarok/scorev3
Modify osu! standardised scoring to introduce a combo exponent
2023-12-12 17:38:44 +09:00
Givikap120
2d94841929 fixed one test 2023-12-10 02:00:32 +02:00
Givikap120
faf54bca43
Merge branch 'master' into arod_rate_adjust 2023-12-10 01:49:18 +02:00
Givikap120
f5b93121f1 Update AdjustedAttributesTooltip.cs 2023-12-10 00:51:50 +02:00
Givikap120
78cdedf34d Update BeatmapAttributesDisplay.cs 2023-12-10 00:42:02 +02:00
Givikap120
1d0c37e138 fixed test errors 2023-12-10 00:40:05 +02:00
Dan Balasescu
b36db3518c
Add keycount to song select details panel and carousel panels 2023-12-09 22:31:51 +09:00
Dan Balasescu
767d5c8018
Add object counts to IBeatmapDifficultyInfo 2023-12-09 22:31:51 +09:00
Bartłomiej Dach
07da9d95a9
Merge pull request #25689 from peppy/taiko-multiplier-fix
Fix osu!taiko slider velocity being written incorrectly to `.osu` file on export
2023-12-07 14:12:42 +01:00
Dean Herbert
ea0ad2a0ef
Merge branch 'master' into online-presence 2023-12-07 17:42:46 +09:00
Dean Herbert
3c29e9162c
Merge pull request #25693 from bdach/online-presence-structure-serialisation
Simplify user presence structures for serialisability
2023-12-07 17:39:21 +09:00
Bartłomiej Dach
9e93ca9679
Merge branch 'master' into taiko-multiplier-fix 2023-12-07 08:36:44 +01:00
Dean Herbert
07dc44ccd7
Make log export async and show notification on completion 2023-12-07 16:19:17 +09:00
Dean Herbert
a500f55ec6
Merge pull request #25688 from peppy/match-default-sv
Change default slider velocity for new beatmaps to match osu!stable
2023-12-07 11:52:16 +09:00
Bartłomiej Dach
37049d41b4
Show user's status as tooltip on the extended user panel 2023-12-06 19:37:35 +01:00
Bartłomiej Dach
86e003aec1
Update currently online display tests 2023-12-06 19:37:35 +01:00
Bartłomiej Dach
54f3a622be
Retrofit user presence watching into dashboard overlay 2023-12-06 19:37:35 +01:00
Bartłomiej Dach
41c33f74f2
Extend metadata client with user presence-observing capabilities 2023-12-06 19:37:35 +01:00
Bartłomiej Dach
d66fa09320
Simplify UserStatus to be an enumeration type
There were absolutely no gains from having it be a reference type /
class, only complications, especially when coming from the serialisation
angle.
2023-12-06 18:52:27 +01:00
Bartłomiej Dach
cb823f367f
Simplify UserActivity for serialisability over the wire
Up until now, the `UserActivity` class hierarchy contained things like
beatmap info, room info, full replay info, etc. While this was
convenient, it is soon going to be less so, as the data is sent over the
wire to the spectator server so that the user's activity can be
broadcast to other clients.

To counteract this without creating a second separate and slimmed-down
class hierarchy, slim down the `UserActivity` structure to contain the
bare minimum amounts of data such that the structures aren't overly
large and complex to serialise, but also contain enough data that they
can be used by receiving clients directly without having to do beatmap
or score lookups.
2023-12-06 18:52:26 +01:00
Bartłomiej Dach
f239d03d75
Forcibly change ruleset to correct one before entering gameplay from main menu
Closes #25663 (again).

As it turns out, in some scenarios it can be the case that the current
game-global `Beatmap` is not valid for the current game-global
`Ruleset`. The validity of one and the other in conjunction is only
really validated by the song select screen; elsewhere there is no
guarantee that the global beatmap is playable using the global ruleset.

However, this only comes up in very specific circumstances, namely one:
when trying to autoplay a catch beatmap with osu! ruleset globally
active via the skin editor flow.

`Player` is responsible for retrieving the beatmap to be played. It does
so by invoking the appropriate beatmap converter and asking it if the
beatmap can be converted:

	6d64538d7a/osu.Game/Beatmaps/WorkingBeatmap.cs (L262-L266)

If the code above throws, `Player` actually silently covers for this, by
trying the beatmap's default ruleset instead:

	6d64538d7a/osu.Game/Screens/Play/Player.cs (L529-L536)

However, for the pairing of osu! ruleset and catch beatmap, this fails,
as `OsuBeatmapConverter`'s condition necessary for permitting conversion
is that the objects have a defined position:

	6d64538d7a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs (L25)

which they will do, due to the fact that all catch beatmaps are really
just osu! beatmaps but with conversion steps applied, and thus `Player`
succeeds to load the catch beatmap in osu! ruleset.

In the skin editor scenario, this would lead to the secondary failure
of the skin editor trying to apply `CatchModAutoplay` on top of all
of that, which would fail at the hard-cast of the beatmap
to `CatchBeatmap`.
2023-12-06 10:35:41 +01:00
Bartłomiej Dach
6d64538d7a
Merge pull request #25687 from peppy/fix-skin-editor-beatmap-change
Fix being able to change ruleset / beatmap when opening skin editor from main menu
2023-12-06 10:08:29 +01:00
Bartłomiej Dach
f69a5b44cc
Merge branch 'master' into fix-argon-initial-display 2023-12-06 09:30:28 +01:00
Bartłomiej Dach
4585a169b1
Merge pull request #25686 from peppy/fix-song-select-match
Fix searching at song select matching incorrect ruleset
2023-12-06 09:25:47 +01:00
Dean Herbert
ca991f1f54
Move flags local to EndlessPlayer 2023-12-06 17:18:35 +09:00
Dean Herbert
1b50d1011a
Move constant local to taiko 2023-12-06 15:59:34 +09:00
Dean Herbert
b5bae566c2
Fix incorrect slider velocity being written on export for osu!taiko beatmaps 2023-12-06 15:59:34 +09:00
Dean Herbert
0af16732b8
Change default slider velocity to 1.4
This is the default in osu!stable and plays better than 1.0.
2023-12-06 13:38:46 +09:00
Dean Herbert
4da6d53c72
Merge pull request #25672 from frenzibyte/fix-argon-health-display-2
Fix `ArgonHealthDisplay` sometimes behaving weirdly on miss judgements (alternative)
2023-12-06 12:24:39 +09:00
Dean Herbert
639fac2d49
Fix being able to change ruleset / beatmap when opening skin editor from main menu
No tests because it would be silly to test this – it's already a well
established behaviour and was just initialised incorrectly.
2023-12-06 12:09:34 +09:00
Dean Herbert
8286d3896f
Fix searching at song select matching incorrect ruleset
Regressed with https://github.com/ppy/osu/pull/25679.
2023-12-06 11:32:26 +09:00
POeticPotatoes
07f9f5c6d8 Remove hover checks for mod-copying menu item 2023-12-06 06:33:25 +08:00
Salman Ahmed
f45336a4f6 Make skin dropdown searching non-contiguous 2023-12-05 22:53:48 +03:00
Salman Ahmed
d4aedaf22d Always show search bar in skin dropdown for visibility 2023-12-05 22:53:48 +03:00
Salman Ahmed
ee2e176082 Add osu! dropdown search bar implementation 2023-12-05 22:53:48 +03:00
Salman Ahmed
d92db8059e Add new dropdown properties to SettingsDropdown 2023-12-05 22:53:48 +03:00
Salman Ahmed
b8b82f8901 Handle back action in OsuDropdown rather than menu 2023-12-05 22:47:10 +03:00
Salman Ahmed
a0813d18ca CalculatedTextSize -> FontSize 2023-12-05 22:47:10 +03:00
Salman Ahmed
20fd458fac Perserve miss animation when followed by a hit at same frame 2023-12-05 21:59:28 +03:00
Salman Ahmed
9496cdf42b Add explanatory note for scheduling 2023-12-05 21:59:28 +03:00
Salman Ahmed
927cfe4257 Fix health processor event leaks 2023-12-05 21:59:28 +03:00
Bartłomiej Dach
88095aaefa
Merge pull request #25637 from smoogipoo/multiplayer-abort
Add ability for the host to abort an in-progress match
2023-12-05 13:51:00 +01:00
Bartłomiej Dach
4644c4e7a2
Remove unused class 2023-12-05 12:43:32 +01:00
Bartłomiej Dach
566d336470
Merge pull request #25679 from peppy/song-select-search-performance
Improve song select search performance
2023-12-05 11:06:31 +01:00
Dean Herbert
8704dc3505
Fix change in filter behaviour 2023-12-05 18:20:27 +09:00
Dean Herbert
5a2240838b
Merge branch 'master' into multiplayer-abort 2023-12-05 17:01:54 +09:00
Dean Herbert
02178d8e61
Remove usage of case-when 2023-12-05 16:58:16 +09:00
Dean Herbert
f317e06da1
Use DangerousActionDialog 2023-12-05 16:54:44 +09:00
Dean Herbert
7b9c9a3bfd
Merge pull request #25675 from vegguid/editor-setup-show-filename
Changed the LabelledFileChooser in the setup to show the file name of the file that is was selected
2023-12-05 16:38:07 +09:00
Dean Herbert
45e499778f
Search terms before performing other criteria checks
Very minor, but putting the more common case towards the
start of the method allows early return.
2023-12-05 15:28:56 +09:00
Dean Herbert
42010574b5
Avoid list construction when doing filtering 2023-12-05 15:26:14 +09:00
Dean Herbert
27e778ae09
Avoid sorting items when already in the correct sort order 2023-12-05 14:47:32 +09:00
Dean Herbert
7fda38d0b0
Use ordinal comparison when searching at song select
Bypasses various overheads. In theory should be fine? (until it's not on some language)
2023-12-05 14:14:13 +09:00
Guido
8756dd25c6 Changed file chooser in resource selection to show file name when file is selected 2023-12-04 22:51:56 +01:00
Salman Ahmed
629e64d50a Fix ArgonHealthDisplay not displaying miss correctly during initial transition 2023-12-04 23:55:31 +03:00
Salman Ahmed
4d82a55594 Remove method for being unused 2023-12-04 23:24:28 +03:00