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

36217 Commits

Author SHA1 Message Date
Dan Balasescu
dddbc7496a
Merge pull request #21168 from peppy/fix-storyboard-extension-lookup
Fix sprites not displaying in storyboard if filename extension is missing in script
2022-11-10 12:31:00 +09:00
Dan Balasescu
051f7f4c68
Merge pull request #21173 from peppy/toggle-hit-markers
Add the ability to toggle off hit marker displays in the editor
2022-11-10 12:23:53 +09:00
Dean Herbert
3547c04002
Merge branch 'master' into skinnable-things-cleanup 2022-11-10 12:09:32 +09:00
Dan Balasescu
f90010628c
Merge pull request #21185 from peppy/fix-editor-sample-spam
Fix editor playing too many sounds when user performs a manual seek during playback
2022-11-10 12:05:16 +09:00
Dan Balasescu
040d7ee247
Merge pull request #21183 from peppy/skinnable-nullability
Apply nullability considerations to all skin related classes
2022-11-10 11:50:41 +09:00
Joseph Madamba
2b81f3048c
Merge branch 'master' into close-side-overlays-when-main-overlay 2022-11-09 12:48:57 -08:00
Samaoo
be81c658af move tablet area calculations to functions 2022-11-09 20:14:01 +01:00
Piggey
0011f4e7be fix comment lol 2022-11-09 19:59:04 +01:00
Piggey
4fbc240aa1 Merge remote-tracking branch 'origin/gameplay-leaderboard-fix' into gameplay-leaderboard-fix 2022-11-09 19:53:56 +01:00
Piggey
ab53fb17d3 change displayed text from #? to - 2022-11-09 19:53:36 +01:00
Samaoo
533a2db5ea fix inaccurate tablet area dimensions when applying aspect ratio 2022-11-09 18:48:47 +01:00
Dean Herbert
e19ba65f91 Remove LookupName from base ISkinComponentLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94 Rename SkinnableTarget to GlobalSkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
ab458320c4 Fix some lingering inspections 2022-11-09 17:46:24 +09:00
Dean Herbert
4457648b1c Fix editor playing too many sounds when user performs a manual seek during playback 2022-11-09 17:42:33 +09:00
Dean Herbert
d4251271d8 Apply nullability to SkinnableDrawable 2022-11-09 13:59:13 +09:00
Dean Herbert
bf26dbffc2 Apply nullability to skinning support classes 2022-11-09 13:59:13 +09:00
Dawid Sośnia
9549e55ef8
Merge branch 'ppy:master' into gameplay-leaderboard-fix 2022-11-08 20:04:13 +01:00
Piggey
d48c56818f change positionText to display "#?" if tracked score is being 51st on the leaderboard 2022-11-08 20:02:21 +01:00
Dean Herbert
4448fcb3c8 Override combo colour brightness normalisation setting only in editor 2022-11-08 18:29:10 +09:00
Dean Herbert
dd4cd3cf8e Move gameplay configuration to interface to allow editor overriding 2022-11-08 18:25:24 +09:00
Dean Herbert
ada039151b Add the ability to toggle off hit marker displays in the editor 2022-11-08 18:07:06 +09:00
Dean Herbert
9650ae1329 Limit editor background dim to 75% maximum 2022-11-08 17:20:37 +09:00
Dean Herbert
349d262c18 Remove commented unbind 2022-11-08 17:19:48 +09:00
Dean Herbert
b166e477c2
Merge branch 'master' into editor-background 2022-11-08 17:18:34 +09:00
Dean Herbert
b9374cae55 Hide settings/notifications regardless of IsPresent state of new overlay 2022-11-08 14:38:02 +09:00
Dean Herbert
0b34340447 Fix sprites not displaying in storyboard if filename extension is missing in script 2022-11-08 14:34:28 +09:00
Dean Herbert
064a245c50 Don't trim whitespace from variable keys / values 2022-11-08 13:30:11 +09:00
Dean Herbert
b764d1bd04 Decode variables earlier in flow in case they include indent logic
Without this change, the `depth` calculation could be incorrect.
2022-11-08 13:29:42 +09:00
maromalo
64e6276397 Fix score rounding issue 2022-11-08 01:10:21 -03:00
Dean Herbert
49f530910c
Merge pull request #21163 from frenzibyte/always-show-cursor-on-focus-loss
Always display menu cursor when game is not focused
2022-11-08 12:37:19 +09:00
Dean Herbert
2163cd212b Automatically close settings and notification overlays when opening main overlay
Closes #21162.
2022-11-08 12:04:07 +09:00
Salman Ahmed
1465d043f4
Merge branch 'master' into song-select-transition-improvement 2022-11-08 03:36:19 +03:00
Susko3
8568520c33 Fix Prefer24HourTime default value
Will use the system culture so it always matches the rest of the OS.
2022-11-08 01:34:06 +01:00
Salman Ahmed
7ee9018a94 Always display menu cursor when game is not focused 2022-11-08 03:18:12 +03:00
Dean Herbert
2b72c3833b Remove unnecessary centering logic in DrawableJudgement 2022-11-07 17:19:32 +09:00
Dan Balasescu
fdca3c2d1c Rename method for consistency 2022-11-07 14:35:42 +09:00
Dan Balasescu
67e99b5344 Lookup channels before calling HandleJoinedChannel() 2022-11-07 14:34:55 +09:00
Dean Herbert
c69a4f9333 Move major barline portion to default implementation to allow for further customisation
Of note, this removes the "major" barline triangles from legacy skins. I
think this is more correct, as they did not display in stable.
2022-11-07 14:29:58 +09:00
Dean Herbert
f6d93fcd5a Fix editor hard crash when beatmap file specified out-of-range timeline zoom value 2022-11-07 12:54:02 +09:00
Joseph Madamba
76df61504f
Remove unnecessary timestamp update
Co-authored-by: Dean Herbert <pe@ppy.sh>
2022-11-06 19:45:59 -08:00
Joseph Madamba
61ec0ba566 Make chat line timestamp adjust to 24-hour time setting 2022-11-06 19:28:01 -08:00
Joseph Madamba
b977fc8181 Use autosize instead of max width on fixed width timestamps 2022-11-06 19:28:01 -08:00
Dean Herbert
6085120dc5 Fix incorrect handling of storyboard events with end_time before start_time 2022-11-07 12:25:36 +09:00
Dan Balasescu
f931bdc5ff Fix channel lookup not considering missing ids 2022-11-07 12:25:23 +09:00
Dan Balasescu
cd8402df72 Print event type to logs 2022-11-07 12:11:50 +09:00
Dean Herbert
391840404d Play exiting transition in both directions 2022-11-07 11:59:43 +09:00
Dan Balasescu
cf03001c83 Better handling for joining channels with only ID 2022-11-07 11:52:07 +09:00
Dan Balasescu
e3adf5a985 Handle channel parts 2022-11-07 11:36:55 +09:00
Dan Balasescu
93f84ece0d
Merge pull request #21118 from peppy/increase-main-menu-background-change-delay
Adjust transition effect for main menu backgrounds
2022-11-07 11:33:09 +09:00
maromalo
8eef2ba8de quality shenanigans 2022-11-06 20:12:26 -03:00
maromalo
b7ef9b176d Make score type consistent 2022-11-06 19:59:27 -03:00
Dean Herbert
e7b543de2f Move disabled check to apply to all calls to updateGlow() 2022-11-07 02:19:13 +09:00
Dean Herbert
700f8b0469
Remove pointless nested if conditional
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-11-07 02:13:04 +09:00
Dean Herbert
14a4fdfbe3
Merge pull request #21135 from CenTdemeern1/master
Fix preposition for exclusive fullscreen prompt
2022-11-07 00:00:19 +09:00
Dean Herbert
75bf023f14 Fix HSPAColour.ToColour not being pure 2022-11-06 23:35:51 +09:00
CenTdemeern1
e8603ede15 Fix second prompt 2022-11-06 15:35:26 +01:00
Dean Herbert
51078bddf9 Remove unused bindable 2022-11-06 23:34:04 +09:00
Dean Herbert
ee68f33e3c
Merge pull request #21109 from frenzibyte/fix-beatmap-duplicating-again
Fix beatmap cards still potentially showing twice in listing
2022-11-06 18:46:31 +09:00
Dean Herbert
e02c477008
Merge pull request #21017 from andy840119/remove-nullable-disable-in-the-checks
Remove nullable disable in the checks.
2022-11-06 18:39:03 +09:00
CenTdemeern1
887a3f3e28 Fix preposition for exclusive fullscreen prompt 2022-11-05 19:44:25 +01:00
Bartłomiej Dach
84179fb087
Merge branch 'master' into combo-colour-brightness-limit 2022-11-05 16:48:56 +01:00
Salman Ahmed
c27f7fa421
Merge branch 'master' into song-select-transition-improvement 2022-11-04 20:16:02 +03:00
Salman Ahmed
ee6f036c44 Add note about using ExceptBy once it's available 2022-11-04 19:35:24 +03:00
Salman Ahmed
ce5aacb760 Filter out duplicated cards using custom equality comparer instead 2022-11-04 19:27:35 +03:00
Salman Ahmed
bd512c4937 Remove equality comparison implementation from BeatmapCard
This turned out to be a hurdle instead as it disallows adding two
beatmap cards of equal beatmap, which, while being a good behaviour in
client, makes tests more complicated to work.
2022-11-04 19:27:20 +03:00
Dan Balasescu
d426977f03 Handle channel joins 2022-11-04 20:11:42 +09:00
Dan Balasescu
f12ada9d92 Fix chat connecting too early 2022-11-04 19:36:24 +09:00
Dean Herbert
78bb940e6c Don't play hover sounds on disabled elements 2022-11-04 19:06:08 +09:00
Dean Herbert
0e350f52f5 Fix SliderBar disabled value potentially not transferring to hover sounds 2022-11-04 19:06:08 +09:00
Dean Herbert
a2fdad4afc Fix slider updating glow when disabled 2022-11-04 19:06:08 +09:00
Dean Herbert
a16540dc6d Update Nub hover animation to better suit immediacy of sound effects 2022-11-04 19:06:08 +09:00
Dan Balasescu
1d2818dc70 Reschedule ack request on completion 2022-11-04 19:02:26 +09:00
Dan Balasescu
66bbe34116 Move polling clients to osu.Game.Tests namespace 2022-11-04 18:52:57 +09:00
Dean Herbert
8b58475ee0 Update OsuButton hover animation to better suit immediacy of sound effects 2022-11-04 18:51:09 +09:00
Dan Balasescu
fa18b5f701 Construct notifications client inside ChannelManager 2022-11-04 18:51:00 +09:00
Dan Balasescu
72745656e7 Remove StartChat()/chat enablement 2022-11-04 18:48:34 +09:00
Dan Balasescu
58396d49dc Fix handling of local echo deduplication 2022-11-04 18:44:22 +09:00
Dean Herbert
4f14ae4e34 Adjust transition effect for main menu backgrounds 2022-11-04 17:45:14 +09:00
Dean Herbert
4bbff99f31 Remove unnecessary fade in SeasonalBackground 2022-11-04 17:45:14 +09:00
Dean Herbert
2b934e0bea Increase delay for changing background on returning to main menu 2022-11-04 17:45:13 +09:00
Dean Herbert
923d44a769 Update dependencies 2022-11-04 17:00:58 +09:00
Dean Herbert
566738494f
Merge pull request #20952 from OliBomby/bezier-convert
Add conversion algorithm for lazer slider curves to work with stable
2022-11-04 16:49:51 +09:00
Dean Herbert
c40c70509e Improve song select transition to gameplay 2022-11-04 15:24:37 +09:00
Joseph Madamba
e11d44d14f Add url clicking support to profile badges 2022-11-03 18:12:32 -07:00
Salman Ahmed
ac8fb4f9b2 Fix beatmap cards still potentially showing twice in listing 2022-11-04 03:23:34 +03:00
Dean Herbert
f6c376c090 Minor refactoring 2022-11-03 20:29:27 +09:00
Dean Herbert
f75c4ba95f Update resources 2022-11-03 20:27:44 +09:00
Dean Herbert
1edde8f73c Merge branch 'master' into disabled-button-sfx 2022-11-03 20:27:41 +09:00
Dean Herbert
cdb3494418
Merge pull request #20765 from Feodor0090/comment-report
Implement comments reporting
2022-11-03 20:09:00 +09:00
Dean Herbert
486515ed90
Merge pull request #20758 from frenzibyte/maintain-common-mod-selection
Maintain selection of common mods when switching rulesets
2022-11-03 20:08:32 +09:00
Jamie Taylor
59bbd9c460
Fix some components using wrong sample set 2022-11-03 17:47:49 +09:00
Jamie Taylor
f1c17129eb
Add support for 'disabled' sample variation to HoverClickSounds 2022-11-03 17:47:49 +09:00
Dean Herbert
c48c9ecb6d
Merge pull request #20743 from frenzibyte/improve-beatmap-card-buttons
Improve clickable area of beatmap card icon buttons
2022-11-03 15:47:08 +09:00
Dean Herbert
e336d486a6
Merge pull request #21093 from peppy/auto-skip-multiple-times
Fix automated skip not skipping more than once when required
2022-11-03 15:46:56 +09:00
Dean Herbert
56ef519cc2 Move PopoverContainer into OnlineOverlay to ensure correct colours 2022-11-03 15:43:06 +09:00
Dean Herbert
e6c45b8ab5 Merge branch 'master' into comment-report 2022-11-03 15:35:42 +09:00
Dean Herbert
20dd405c2b
Merge branch 'master' into maintain-common-mod-selection 2022-11-03 15:32:40 +09:00
Dean Herbert
07bfac40fa Adjust padding to avoid overlap with card border when expanded 2022-11-03 14:03:28 +09:00
Dean Herbert
66a6084d3f Scale in the background fill alongside the icon 2022-11-03 14:03:19 +09:00
Dan Balasescu
fc191807c6 Fix velocity test failing with no audio device 2022-11-03 13:59:22 +09:00
Dean Herbert
df9f49eef2 Move hover layer behind icon
Looked bad on the "already downloaded" state where the icon becomes
black.
2022-11-03 13:56:07 +09:00
Dean Herbert
fb0bc597a0 Merge branch 'master' into improve-beatmap-card-buttons 2022-11-03 13:53:29 +09:00
Dean Herbert
4154be6cda Adjust auto-skip to skip multiple times if necessary 2022-11-03 13:52:29 +09:00
Dean Herbert
aef3c7918c Add total skip count to SkipOverlay 2022-11-03 13:52:24 +09:00
cdwcgt
7073d8dd8e
range and precision for EditorDim 2022-11-02 19:57:01 +09:00
cdwcgt
a44c7c7514
range and precision for EditorWaveformOpacity 2022-11-02 19:56:35 +09:00
Dean Herbert
3ec9686e58 Fix test failures and rename configuration value to match better 2022-11-02 18:15:18 +09:00
Dean Herbert
0e502de8b4 Rename field to match usage 2022-11-02 18:04:42 +09:00
Dean Herbert
4f8e912f06 Fix APINotification parsing failing 2022-11-02 17:53:19 +09:00
Dean Herbert
c3eb0c6330 Merge branch 'master' into editor-background 2022-11-02 17:43:38 +09:00
Dan Balasescu
063a8bdf9e Remove messages from silenced users 2022-11-02 17:13:14 +09:00
Dan Balasescu
f688ed12d0 Add test for removing chat messages 2022-11-02 17:00:47 +09:00
Dan Balasescu
cb51fc7384
Merge pull request #21071 from peppy/fix-multiple-import-notifications
Fix multiple notifications arriving for imports in edge cases
2022-11-02 16:54:56 +09:00
Dan Balasescu
db34f238c0 Fix inverted condition 2022-11-02 15:47:30 +09:00
Dan Balasescu
e5f53b1ad8 Use Interlocked.Exhange() instead
Increment isn't correct since it returns the post-incremented value. It
also always increments.
2022-11-02 15:18:48 +09:00
cdwcgt
9884618290
rename editorDim to editorBackgroundDim 2022-11-02 15:12:15 +09:00
cdwcgt
d6b8439121
add xmldoc for DimAmount 2022-11-02 15:11:49 +09:00
cdwcgt
df1f7e2b13
remove #nullable disable 2022-11-02 15:09:40 +09:00
Dean Herbert
2b04e852be
Merge branch 'master' into websocket-chat-2 2022-11-02 14:56:13 +09:00
Dan Balasescu
22f662a076
Merge pull request #21070 from peppy/standardise-visual-settings-ui-components
Standardise "Visual Settings" components to fix mismatched paddings and labels
2022-11-02 14:53:00 +09:00
Dean Herbert
e761c0395d Fix multiple notifications arriving for imports in edge cases 2022-11-02 14:47:56 +09:00
Dean Herbert
4dabb1aa9c
Merge pull request #20990 from smoogipoo/socket-client
Generalise `HubClientConnector` into `SocketClientConnector`
2022-11-02 14:17:36 +09:00
Dean Herbert
37300ba9e2 Standardise "Visual Settings" components to fix mismatched paddings and labels 2022-11-02 14:01:57 +09:00
Dean Herbert
50b6fe4acb Localise new label 2022-11-02 14:01:03 +09:00
Dean Herbert
61fc3c8cc0 Add setting to visual settings toolbox 2022-11-02 13:58:34 +09:00
Dean Herbert
5b8699872f Merge branch 'standardise-visual-settings-ui-components' into combo-colour-brightness-limit 2022-11-02 13:58:33 +09:00
Dean Herbert
d8aa06ea92 Standardise "Visual Settings" components to fix mismatched paddings and labels 2022-11-02 13:55:56 +09:00
Dean Herbert
99ba7c29dd Change range to 0-100% and rename to "normalisation" 2022-11-02 13:47:11 +09:00
Dan Balasescu
30800c9252 Add/adjust xmldocs 2022-11-02 13:16:34 +09:00
Dean Herbert
2f3c80f884 Remove toggle and change method of application to blend with original colour 2022-11-02 13:08:29 +09:00
Dean Herbert
a01602e63c Merge branch 'master' into combo-colour-brightness-limit 2022-11-02 12:09:27 +09:00
Dan Balasescu
3816152c9d Merge branch 'socket-client' into websocket-chat-2 2022-11-02 11:49:57 +09:00
Dan Balasescu
e59c8b7d24 Use IDisposable instead 2022-11-02 11:49:04 +09:00
Dan Balasescu
c9108ce41b Rename StartAsync -> ConnectAsync 2022-11-02 11:44:16 +09:00
Dan Balasescu
46d1713e28 Rename Socket* -> PersistentEndpoint* 2022-11-02 11:43:22 +09:00
Dan Balasescu
8ac2075c61 Fix possible threading issues
Not really sure of the best way to handle this in general. It could be
argued that this should be a `Component` type and the bindable bound in
`LoadComplete()`...
2022-11-02 10:04:25 +09:00
Dean Herbert
9f031b55a1 Merge branch 'master' into fix-directory-selector-breadcrumb 2022-11-01 22:28:13 +09:00
Dean Herbert
e104242864 Update framework 2022-11-01 22:28:06 +09:00
Dan Balasescu
5b25ef5f2f Construct notifications client via IAPIProvider 2022-11-01 21:34:34 +09:00
Bartłomiej Dach
ac554c644d
Merge branch 'master' into fix-slider-sv-snap 2022-11-01 13:19:46 +01:00
Dan Balasescu
5621db8a2e
Merge pull request #21052 from peppy/fix-control-point-info
Fix control points not being cloned when running beatmap conversion
2022-11-01 21:04:49 +09:00
Dean Herbert
f014acfc8d Fix DrawableHitObject.AccentColour not being updated if object entry is not attached 2022-11-01 19:34:53 +09:00
Dean Herbert
27af91003b Merge branch 'master' into combo-colour-brightness-limit 2022-11-01 17:50:26 +09:00
Dean Herbert
978d15955c Fix control points not being cloned when running beatmap conversion
Closes #20994.

I haven't considered how this affects performance of difficulty
calculation or otherwise. Seems like a sane initial fix which we can
iterate on going forward.

I've tested using the scenario in the linked issue.

I'm not going to add test coverage because
[BeatmapConversionTest](https://github.com/ppy/osu/blob/master/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs)
should correctly cover this scenario once we are serialising control
points as well.
2022-11-01 17:42:09 +09:00
Dean Herbert
29bc653d24 Remove incorrect double multiplication and add missing test coverage 2022-11-01 17:17:54 +09:00
Dean Herbert
d15585153d Fix breadcrumb display in directory selector overlapping new "show hidden" button
Closes #21034.
2022-11-01 17:07:59 +09:00
Dean Herbert
8280605e92 Fix notch toggle not applying correctly after restart 2022-11-01 16:31:09 +09:00