1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 23:37:26 +08:00
Commit Graph

7198 Commits

Author SHA1 Message Date
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
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
smoogipoo
3956a0669a Fix editor seek transform seeking too much 2020-11-02 21:08:58 +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
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
73b290aca3 Merge branch 'master' into results-dynamic-pp-calc 2020-11-02 14:47:33 +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
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
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
19023e7d43 Fix player restart invoking user-level pause 2020-10-31 16:08:15 +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
38cf90a69b Change background to seasonal right after login 2020-10-30 22:03:26 +01:00
Bartłomiej Dach
67a325f47d Move config setting logic to background loader 2020-10-30 21:22:22 +01:00
Max Hübner
d5dfd1dffe Insert optional parentheses 2020-10-30 18:07:07 +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
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
cadon0
a1fa6588f6 Fix "bounce" when metadata container text is empty 2020-10-31 01:06:19 +13: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
Dan Balasescu
0ef1459f4b
Merge pull request #10621 from peppy/hud-momentary-visibility
Add momentary HUD toggle
2020-10-30 15:40:54 +09:00
Dan Balasescu
b14291a312
Merge branch 'master' into tracked-hud-visibility-settings 2020-10-30 14:58:45 +09:00
Dean Herbert
8928aa6d92 Add key binding to show HUD while held 2020-10-30 14:19:40 +09:00
Dean Herbert
b4eda65383 Commit missing pieces 2020-10-30 13:53:51 +09:00
Dean Herbert
9bb86ccb83 Change shift-tab to cycle available HUD visibility modes 2020-10-30 13:09:22 +09:00
Dean Herbert
46d89d55f4 Add note about ScheduleAfterChildren requirement 2020-10-30 12:47:04 +09:00
Dean Herbert
823230f06a Merge branch 'sample-lookup-improvements' into results-screen-applause 2020-10-30 12:17:36 +09:00
Dean Herbert
2ea4aa0a37 Fix incorrect specification on some sample lookups 2020-10-30 11:59:41 +09:00
Dean Herbert
0c1d12460f Remove unused parameter 2020-10-30 10:30:11 +09:00
Max Hübner
fb1e09b3e7 Load seasonal backgrounds according to setting 2020-10-29 18:04:48 +01:00
Max Hübner
34371b8888 Show next Background on showSeasonalBackgrounds.ValueChanged 2020-10-29 17:44:23 +01:00
Max Hübner
bf4d99dfe7 Load SeasonalBackgroundLoader asynchronously 2020-10-29 17:43:10 +01:00
Dean Herbert
87be7d162b
Merge branch 'master' into spectator-replay-watcher 2020-10-30 00:25:17 +09:00
Max Hübner
b189e0b7cf Revert "Load SeasonalBackgroundLoader asynchronously"
This reverts commit 81ebcd8796.
2020-10-29 16:01:22 +01:00
Dean Herbert
404885af89 Merge branch 'results-screen-animate-once' into results-screen-applause 2020-10-29 18:52:54 +09:00
Dean Herbert
3491dea9e2 Fix scroll logic running before children may be alive in flow 2020-10-29 18:51:54 +09:00
Dean Herbert
f1b8a8f7f5 Remove unused using 2020-10-29 18:16:04 +09:00
Dean Herbert
0a0239a7c7 Only play results panel animation once (and only for the local user) 2020-10-29 17:08:59 +09:00
Dean Herbert
11f85779d5 Fix panel expanded state being updated multiple times unnecessarily 2020-10-29 17:08:59 +09:00
Dean Herbert
71e373ff51 Make results panels aware of whether they are a local score that has just been set 2020-10-29 17:08:59 +09:00
Dean Herbert
4a26084df8 Only play results panel animation once (and only for the local user) 2020-10-29 17:04:33 +09:00
Dean Herbert
f1ce09930e Fix panel expanded state being updated multiple times unnecessarily 2020-10-29 17:03:45 +09:00
Dean Herbert
5d5b0221e5 Add skinning support for legacy applause playback 2020-10-29 16:32:29 +09:00
Dean Herbert
fb82c043a5 Add rank appear sound (new default) 2020-10-29 16:11:37 +09:00
Dean Herbert
a8e9c62583 Make results panels aware of whether they are a local score that has just been set 2020-10-29 16:11:25 +09:00
Dan Balasescu
8ccc3c2ec8
Merge pull request #10596 from charlie-gray/right-click-circle-delete
Add support for deleting objects when Shift is held down
2020-10-29 11:37:22 +09:00
Bartłomiej Dach
a1696942f0 Merge branch 'master' into right-click-circle-delete 2020-10-28 22:12:14 +01:00
Bartłomiej Dach
202fe09306 Group selection actions back up in SelectionHandler 2020-10-28 22:06:48 +01:00
Dean Herbert
bca317b151 Remove excess using statement 2020-10-28 23:43:16 +09:00
Dean Herbert
e1bf751dac Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-28 23:17:50 +09:00
Dean Herbert
5d02de29ca Fix attempt to change ruleset/beatmap bindables while screen is not active 2020-10-28 22:50:45 +09:00
Dean Herbert
25ab3a5fea Construct replay after being sure a ruleset is available to avoid nullrefs 2020-10-28 22:10:37 +09:00
Dean Herbert
dd2f44f393 Add basic "currently watching" text to player to signify that spectator is active 2020-10-28 19:43:06 +09:00