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

21264 Commits

Author SHA1 Message Date
Dean Herbert
1dcbf15d81
Merge branch 'master' into move-cache-logic-to-base-impl 2020-11-06 14:35:06 +09:00
Dan Balasescu
9ec5f9bff8
Merge pull request #10711 from peppy/rename-cache-classes
Rename cache classes in line with their function (and share a base implementation)
2020-11-06 14:34:47 +09:00
Dean Herbert
b69ada64e8 Update BeatmapDifficultyCache to use base implementation logic 2020-11-06 14:31:21 +09:00
Dean Herbert
a2606d31c7 Move lookup/storage/compute logic to base class (and consume in ScorePerformanceCache) 2020-11-06 13:51:41 +09:00
Dean Herbert
517a656899 Move StarDifficulty to own file 2020-11-06 13:51:25 +09:00
Dean Herbert
74ca2faa31 Remove unused using 2020-11-06 13:48:06 +09:00
Dean Herbert
07166ec819 Fix a couple of remaining unnecessary casts 2020-11-06 13:29:47 +09:00
Dean Herbert
0103b12575 Add basic base class to begin to standardise function across caching components 2020-11-06 13:26:39 +09:00
Dan Balasescu
71a1165209
Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-06 13:19:25 +09:00
Dean Herbert
14bb079feb Rename ScorePerformanceManager to ScorePerformanceCache 2020-11-06 13:15:33 +09:00
Dean Herbert
5113d4af8f Rename BeatmapDifficultyManager to BeatmapDifficultyCache 2020-11-06 13:14:29 +09:00
Dean Herbert
1e1569eb53 Use int instead of long for user_id fields for now 2020-11-06 12:59:46 +09:00
Dean Herbert
d774afd224 Update framework 2020-11-05 22:29:44 +09:00
Dean Herbert
309b1d6334
Merge pull request #10695 from peppy/fix-skinnable-test-scene
Fix SkinnableTestScene's autosize propagation
2020-11-05 20:48:36 +09:00
Dean Herbert
a0b3379909 Fix judgement offsets being zero when windows are empty 2020-11-05 18:58:37 +09:00
Dean Herbert
2bbdbfda5c
Merge pull request #10696 from smoogipoo/visibility-adjustment-mod 2020-11-05 18:18:57 +09:00
Dean Herbert
2d50a7b616
Fix a few xmldoc typos 2020-11-05 17:38:02 +09:00
Dean Herbert
019d286ce8 Merge branch 'drawable-hit-object-hit-state-fix' into add-spinner-glow 2020-11-05 17:27:38 +09:00
Dean Herbert
8aa0a698d9 Avoid errors due to second set 2020-11-05 17:26:41 +09:00
Dean Herbert
9c91f16e3a Update sizing as early as possible in addition to scheduling (to handle any dependent edge cases) 2020-11-05 17:24:59 +09:00
Dean Herbert
8293846afc Merge branch 'master' into fix-skinnable-test-scene 2020-11-05 17:24:24 +09:00
Dean Herbert
0cadb31947 Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-05 17:07:52 +09:00
smoogipoo
9d5b1ec28c Add removal dates 2020-11-05 17:04:11 +09:00
Dean Herbert
2d0c62dce2 Fix SkinnableTestScene's autosize propagation
Regressed with recent DrawableHitObject changes (moving of
RelativeSizeAxes specifications out of constructors).
2020-11-05 16:37:48 +09:00
Dean Herbert
414daab1dc Fix paused samples potentially getting stuck in a playing state in rapid toggling
Closes #10693. Should be obvious why.
2020-11-05 16:14:23 +09:00
smoogipoo
cc518feca7 Make methods abstract 2020-11-05 16:03:10 +09:00
smoogipoo
a219aa7ba2 Add xmldoc 2020-11-05 15:53:35 +09:00
smoogipoo
628b8be15d Implement ModWithVisibilityAdjustment 2020-11-05 15:40:25 +09:00
smoogipoo
9a7fcadabc Use BDL for top-level osu! DHOs 2020-11-05 13:51:46 +09:00
Dan Balasescu
ea2fd831ab
Merge branch 'master' into editor-slider-control-point-quick-delete 2020-11-05 00:38:42 +09:00
Dean Herbert
d19b799f44 Invert boolean logic 2020-11-04 17:53:03 +09:00
Dean Herbert
68b7efe4d5 Change order of execution to be chronological 2020-11-04 17:14:23 +09:00
Dean Herbert
831325978a Always execute UpdateHitStateTransforms (even for idle) 2020-11-04 17:14:23 +09:00
Dean Herbert
3b6cf95f49 Remove parameter from StartTime method and add obsoleted previous version 2020-11-04 16:39:52 +09:00
Dean Herbert
7f30140b7e Add new method handling hit state specifically
Until now UpdateStateTransforms was applying results offsets to
StartTime. This didn't cover the case of a HitObject with duration,
where the call would be made with `StartTime + hitOffset` rather than
`EndTime + hitOffset`.

To resolve this, a new method has been added which should be used to
handle hit-specific state transforms.
2020-11-04 16:13:14 +09:00
Dan Balasescu
3322c2bbc5
Merge branch 'master' into ios-editor-crash-fix 2020-11-04 15:56:40 +09:00
Dean Herbert
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
Dan Balasescu
42c543f5b9
Merge branch 'master' into fix-editor-play-after-drag 2020-11-04 14:45:20 +09:00
Dan Balasescu
98c992004b
Merge pull request #10660 from peppy/fix-song-select-first-track-looping
Fix looping mode not being set on first track after entering song select
2020-11-04 14:37:27 +09:00
Dan Balasescu
c6779b414e
Merge pull request #10611 from peppy/spectator-listing
Add "currently playing" player listing and spectator UI flow
2020-11-04 14:08:11 +09:00
Dean Herbert
cfe3218239 Move scheduler call to inside method itself for added safety 2020-11-04 10:23:06 +09:00
Dean Herbert
29e8e5ab94 Merge branch 'master' into fix-load-async-after-disposal-beatmap-wedge 2020-11-04 10:23:05 +09:00
Dean Herbert
9dc2ca666d
Merge branch 'master' into spectator-listing 2020-11-04 09:30:15 +09:00
Bartłomiej Dach
3bb86ce127
Merge branch 'master' into editor-waveform-opacity 2020-11-03 23:04:19 +01:00
Bartłomiej Dach
13f729916a
Merge branch 'master' into editor-timeline-scroll-mousewheel 2020-11-03 22:27:35 +01:00
Bartłomiej Dach
ddf0d75c38 Don't fall through to seek if handling zoom 2020-11-03 21:49:21 +01:00
Bartłomiej Dach
4b528e80d0 Use AltPressed shorthand 2020-11-03 21:49:04 +01:00
Bartłomiej Dach
211510fe9a Fix undesirable vertical spacing in currently playing display 2020-11-03 19:12:03 +01:00
Bartłomiej Dach
86d283ebf4 Adjust layout slightly to avoid specifying width twice 2020-11-03 19:03:48 +01:00
Bartłomiej Dach
18428dff8e Ensure hotkey actions are executable in handler 2020-11-03 18:01:12 +01:00
Dean Herbert
83c004bbde Add key bindings for flip and reverse patterns 2020-11-03 21:10:31 +09:00
Dean Herbert
9f333ac58a Add the ability to delete slider control points using shift+right click
Closes https://github.com/ppy/osu/issues/10672.

In two minds about how this should be implemented but went in this
direction initially. The other way would be to add local handling of
Shift-Right Click inside PathControlPointPiece (which is already doing
mouse handling itself).
2020-11-03 20:46:33 +09:00
Dean Herbert
1b2bd6a8c9 Remove redundant base call 2020-11-03 20:10:13 +09:00
Dean Herbert
3e29e468ea Ensure "start watching" button starts in a disabled state 2020-11-03 20:06:42 +09:00
Dean Herbert
a3c67aabe2 Merge branch 'master' into spectator-listing 2020-11-03 19:56:25 +09:00
Dean Herbert
d788931661 Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal
As seen in https://ci.appveyor.com/project/peppy/osu/builds/36109658/tests.

Also adds cancellation logic for good measure.
2020-11-03 19:53:45 +09:00
Dean Herbert
df9ff76f23 Reduce assert to guard in the outwards direction 2020-11-03 16:49:13 +09:00
Dean Herbert
f701a38e20 Merge branch 'master' into fix-song-select-first-track-looping 2020-11-03 16:48:20 +09:00
Dean Herbert
c2ffc18379 Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held) 2020-11-03 16:30:11 +09:00
Dean Herbert
0dcb4ea441 Add handling of opacity to timeline waveform display 2020-11-03 16:07:01 +09:00
Dean Herbert
7e4314684b Add editor waveform opacity selection to menu 2020-11-03 16:01:14 +09:00
Dean Herbert
6bf35d5767 Fix editor menu not supporting stateful item drawables 2020-11-03 16:00:07 +09:00
Dean Herbert
34aa59f237 Fix editor clock not always remaining stopped when dragging timeline
Closes https://github.com/ppy/osu/issues/10461.
2020-11-03 15:00:01 +09:00
Bartłomiej Dach
b152514bc7
Merge branch 'master' into spectator-connection-logging 2020-11-02 20:21:45 +01:00
Dean Herbert
ab308d28d2 Debounce calls to UpdateTernaryStates
Just something I noticed in passing recently which may help with
reducing performance overhead of some batch operations.
2020-11-03 01:08:36 +09:00
Dean Herbert
d5c95a8b46 Centralise into methods and add assertions for safety 2020-11-03 00:45:55 +09:00
Dean Herbert
c3d3856a64 Fix looping mode not being set on first track after entering song select
Closes #10656.
2020-11-02 23:51:02 +09:00
Dean Herbert
c1d9a0c92c Move click action out of user panel 2020-11-02 21:09:47 +09:00
smoogipoo
3956a0669a Fix editor seek transform seeking too much 2020-11-02 21:08:58 +09:00
Dean Herbert
ed30756c19 Add test coverage for new display (and remove live version for now) 2020-11-02 20:41:14 +09:00
Dean Herbert
c6de0544d2 Disable display for not 2020-11-02 20:21:23 +09:00
Dean Herbert
5cbfaf3589 Revert "Add (temporary) local user cache to avoid re-querying API each display"
This reverts commit 4e17634ee2.
2020-11-02 20:19:38 +09:00
Dean Herbert
a89aeaf1ce Add very basic connection status logging for spectator streaming client 2020-11-02 17:32:10 +09:00
Dean Herbert
4e17634ee2 Add (temporary) local user cache to avoid re-querying API each display 2020-11-02 17:31:04 +09:00
smoogipoo
6f623d8cca Rename IsUserPaused -> UserPauseRequested 2020-11-02 16:08:59 +09:00
Dean Herbert
414f65c1ef Merge branch 'master' into spectator-listing 2020-11-02 15:48:21 +09:00
Dean Herbert
8adf146f53
Merge pull request #10640 from bdach/fix-music-paused-on-multi-exit 2020-11-02 15:46:19 +09:00
Dean Herbert
ab9e0aac58
Merge pull request #10258 from Game4all/results-dynamic-pp-calc 2020-11-02 15:40:55 +09:00
Dan Balasescu
2c51c24913
Merge pull request #10605 from peppy/spectator-replay-watcher
Add screen hierarchy for spectating another player
2020-11-02 15:29:59 +09:00
Dean Herbert
8f2cd0e8c5 Add matching requestedByUser parameter to Play method 2020-11-02 15:01:30 +09:00
Dean Herbert
d2f6303988 Change default value of requestedByUser to false 2020-11-02 14:56:50 +09:00
Dean Herbert
ecad85b5f5 Merge branch 'master' into fix-music-paused-on-multi-exit 2020-11-02 14:55:15 +09:00
Dan Balasescu
04178e9458
Merge branch 'master' into spectator-replay-watcher 2020-11-02 14:54:51 +09:00
Dean Herbert
7b320a991f Add note about missing expiration logic 2020-11-02 14:53:32 +09:00
Dean Herbert
d46f7535c9 Add xmldoc for new component 2020-11-02 14:50:44 +09:00
Dean Herbert
fb105a1e9c Remove unnecessary field storage 2020-11-02 14:49:25 +09:00
Dean Herbert
73b290aca3 Merge branch 'master' into results-dynamic-pp-calc 2020-11-02 14:47:33 +09:00
Dean Herbert
3adf451e82 Handle changes via SamplePoints list for simplicity 2020-11-02 14:40:40 +09:00
smoogipoo
bd7c3d0d9f Merge branch 'master' into results-screen-applause 2020-11-02 13:38:19 +09:00
Dan Balasescu
1b53e6c782
Merge branch 'master' into sample-lookup-improvements 2020-11-02 13:04:35 +09:00
Dan Balasescu
8a768669ad
Merge pull request #10606 from FamousPig/fix-timeline-drag-select-weirdness
Fix timeline zoom during drag-select causing unexpected behaviour
2020-11-02 13:04:26 +09:00
Dean Herbert
6cfaee0f0b
Merge pull request #10631 from bdach/shift-delete-all-selected 2020-11-02 12:04:58 +09:00
Dean Herbert
6e2d722b8a
Merge pull request #10649 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1 2020-11-02 11:52:38 +09:00
Dan Balasescu
5ae3da9399
Merge branch 'master' into fix-timeline-drag-select-weirdness 2020-11-02 11:18:37 +09:00
Dean Herbert
61c9bb3245
Merge branch 'master' into dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.1 2020-11-02 10:56:09 +09:00
Dan Balasescu
b1b52f9073
Merge branch 'master' into fix-resume-beatmap-options-edit 2020-11-02 10:46:31 +09:00
Dan Balasescu
ba726c6291
Merge pull request #10623 from cadon0/fix-beatmap-details-metadata-bounce
Fix "bounce" when metadata container text is empty in song select
2020-11-02 10:45:14 +09:00
Joehu
71d55f16f3 Fix edit beatmap options button not resuming back to song select 2020-11-01 13:50:38 -08:00
Bartłomiej Dach
432282e8de Use alternative solution to avoid storing last zoom 2020-11-01 21:25:05 +01:00
Bartłomiej Dach
3090b6ccb5 Resolve CA2249 inspections
"Use `string.Contains` instead of `string.IndexOf` to improve
readability"
2020-11-01 18:54:44 +01:00
Bartłomiej Dach
89bf7b1bd6 Resolve CA1835 inspection
"Change the `ReadAsync` method call to use the
`Stream.ReadAsync(Memory<byte>, CancellationToken)` overload"
2020-11-01 18:51:39 +01:00
Bartłomiej Dach
ca5de22ca5 Resolve CA1834 inspection
"Use `StringBuilder.Append(char)` instead of
`StringBuilder.Append(string)` when the input is a constant unit string"
2020-11-01 18:50:13 +01:00
Bartłomiej Dach
2b0bea535e Resolve CA1805 inspections
"Member is explicitly initialized to its default value"
2020-11-01 18:47:40 +01:00
Bartłomiej Dach
716458344f Ensure spectator player is unsubscribed to prevent leak 2020-11-01 16:13:19 +01:00
Bartłomiej Dach
23d9fa4dfa Merge branch 'master' into spectator-replay-watcher 2020-11-01 15:53:37 +01:00
Bartłomiej Dach
b7696c85ad Add more xmldocs 2020-11-01 15:23:03 +01:00
Dean Herbert
1f8d627af4
Merge branch 'master' into shift-delete-all-selected 2020-11-01 23:03:01 +09:00
Dean Herbert
e1b8875553
Merge pull request #10634 from bdach/fix-leftover-selection-box-tooltip
Fix selection box action tooltips still being visible after object deletion
2020-11-01 23:02:29 +09:00
Bartłomiej Dach
5903c3be90 Fix inaccurate xmldoc 2020-11-01 14:39:10 +01:00
Lucas A
6bfff43634 Extract StatisticCounter to a separate class and use it instead. 2020-11-01 13:25:36 +01:00
Bartłomiej Dach
f3e0480e77
Merge branch 'master' into fix-beatmap-details-metadata-bounce 2020-10-31 17:36:40 +01:00
Bartłomiej Dach
79f47953a8 Migrate existing call to new flag parameter 2020-10-31 16:08:27 +01:00
Bartłomiej Dach
19023e7d43 Fix player restart invoking user-level pause 2020-10-31 16:08:15 +01:00
Bartłomiej Dach
941e8525af Add flag parameter to allow non-user-pause via music controller 2020-10-31 16:07:54 +01:00
Dean Herbert
a9a3489e92 Fix potential null reference when loading background
As seen in
https://discordapp.com/channels/188630481301012481/188630652340404224/772094427342569493.
Caused due to async load of the loader, which means it may not be ready
before Next() is called.
2020-10-31 22:51:35 +09:00
Bartłomiej Dach
007c27d3ff Schedule visibility update once per frame 2020-10-31 14:45:11 +01:00
Bartłomiej Dach
d74c19e2d7 Shorten show/hide code 2020-10-31 13:54:02 +01:00
Bartłomiej Dach
3322b8a7ea Run OnSelectionChanged() on each change 2020-10-31 13:54:02 +01:00
Bartłomiej Dach
003994ab75 Bind UpdateVisibility() directly to source of truth 2020-10-31 13:54:02 +01:00
Bartłomiej Dach
129b1bc6d3 Delete all selected objects if shift-clicked on one 2020-10-31 11:46:25 +01:00
Dean Herbert
6a293dd536 Add missing ctor parameters back 2020-10-31 18:56:30 +09:00
Dean Herbert
979eb1685b
Merge branch 'master' into results-screen-applause 2020-10-31 18:47:49 +09:00
Dean Herbert
f0b80d245e Merge branch 'master' into spectator-listing 2020-10-31 16:22:49 +09:00
Dean Herbert
a088151e58 Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-31 16:22:10 +09:00
Bartłomiej Dach
78842ab95a Improve look & behaviour of background transitions 2020-10-30 22:40:24 +01:00
Bartłomiej Dach
391dd73843 Fix typo in comment 2020-10-30 22:39:34 +01:00
Bartłomiej Dach
38cf90a69b Change background to seasonal right after login 2020-10-30 22:03:26 +01:00
Bartłomiej Dach
29ad099902 Allow to fetch if going online after launch 2020-10-30 21:49:14 +01:00
Bartłomiej Dach
67a325f47d Move config setting logic to background loader 2020-10-30 21:22:22 +01:00
Bartłomiej Dach
cf0e8e0a62 Document nullability of seasonal backgrounds 2020-10-30 20:00:59 +01:00
Bartłomiej Dach
aeab2be5d1 Add xmldoc to SeasonalBackgroundMode 2020-10-30 19:56:52 +01:00
Bartłomiej Dach
20c27c6943 Rename lookup & field 2020-10-30 19:55:22 +01:00
Bartłomiej Dach
82ef85569b Fix nullref when querying IsInSeason before request completion 2020-10-30 19:35:08 +01:00
Max Hübner
d5dfd1dffe Insert optional parentheses 2020-10-30 18:07:07 +01:00
Max Hübner
51a58269ad Fix nullref in case of successfull request but no backgrounds available 2020-10-30 17:57:29 +01:00
Max Hübner
0b46c19b23 Move seasonalBackgroundMode check up and early return if available 2020-10-30 17:16:51 +01:00
Max Hübner
f6eb5680ec Save full api response in SessionStatics 2020-10-30 16:43:18 +01:00
Max Hübner
6f6a8e2a8f Convert switch to if 2020-10-30 16:06:48 +01:00
Max Hübner
d19dd4eef6 IsInSeason() -> IsInSeason 2020-10-30 15:56:19 +01:00
Max Hübner
4e3fb615d2 Rename "SeasonalBackgrounds" to "SeasonalBackgroundMode" 2020-10-30 15:54:10 +01:00
Dean Herbert
1db8dfd03e
Merge branch 'master' into seasonal-backgrounds 2020-10-30 22:53:51 +09:00
Dean Herbert
bc69ed3870 Simplify sample lookup 2020-10-30 22:33:27 +09:00
cadon0
a1fa6588f6 Fix "bounce" when metadata container text is empty 2020-10-31 01:06:19 +13:00
Dean Herbert
b4e5311014 Move initial state set inside updateClock 2020-10-30 20:39:25 +09:00
Dean Herbert
1bd461f229 Move clock logic back to inside updateClock method 2020-10-30 20:21:14 +09:00
Max Hübner
f27ce7521d Make "Sometimes" setting depend on season end date, rather than chance 2020-10-30 10:27:43 +01:00
Dean Herbert
79aecc9a98
Merge branch 'master' into spectator-replay-watcher 2020-10-30 16:31:24 +09:00
Dean Herbert
32e68a6a3c Fix FramedReplayInputHandler incorrectly blocking in streaming mode when time requested is before the first frame
Most of this is just tidying up the logic to (hopefully) be better to
follow, again (again (again)).

The actual fix is that we now allow interpolation/playback when the
incoming time is less than the first frame's time, regardless of
receiving status.
2020-10-30 16:09:03 +09:00
Dan Balasescu
0ef1459f4b
Merge pull request #10621 from peppy/hud-momentary-visibility
Add momentary HUD toggle
2020-10-30 15:40:54 +09:00
Dean Herbert
0f997386ae Fix direction and IsRunning not updating on first frame after becoming valid
The parent clock will not unpause until WaitingForFrames becomes false,
so I've moved the set of that before we start to propagate its values
across. Doesn't fix any visible issue but should make propagation one
game loop faster.
2020-10-30 15:26:23 +09:00