smoogipoo
e53f849aa0
Completely separate combo colours from DHOs
2020-11-26 18:14:25 +09:00
smoogipoo
f562854feb
Fix timeline objects sometimes not receiving combo colours
2020-11-26 17:22:22 +09:00
Dan Balasescu
aad6cf4ad3
Merge branch 'master' into editor-multiple-object-positional-snap
2020-11-26 17:06:47 +09:00
Dean Herbert
0ddeff648d
Fix incorrect index lookup on non-ordered selections
2020-11-25 17:25:54 +09:00
Dean Herbert
d4c6d6275e
Fix volume not being adjustable in the editor using alt-scroll
...
We do this in other places so I think it's fine to handle like this for
now (until we come up with a better global solution).
Closes #10958 .
2020-11-25 16:46:22 +09:00
Dean Herbert
c9a41f9dae
Make all objects in selection candidates for spatial snapping
...
Closes #10898 .
2020-11-24 17:35:54 +09:00
Dan Balasescu
5d65665b42
Merge pull request #10943 from peppy/editor-setup-scroll-to-file-selector
...
Scroll editor setup screen to file selector on display
2020-11-24 16:26:25 +09:00
Dean Herbert
bd1dad5477
Remove null allowance for now
2020-11-24 15:54:27 +09:00
Dean Herbert
1d82557d9f
Avoid blocking global actions when skip overlay is not actually active
2020-11-24 15:42:14 +09:00
Dean Herbert
72b8eef36e
Add ability to pause/resume replay playback
2020-11-24 15:41:56 +09:00
Dean Herbert
898e2dae27
Restore kiai time flashing behaviour
2020-11-23 14:27:02 +09:00
Dean Herbert
3ed7868801
Scroll editor setup screen to file selector on display
...
Previously the file selector would potentially display off-screen,
making for confusing UX.
Closes #10942 .
2020-11-23 13:49:14 +09:00
Dean Herbert
ae609b9d48
Remove unnecessary local variable
2020-11-23 13:35:13 +09:00
Dean Herbert
2ae5a95d77
Change opacity value to match master implementation
2020-11-23 13:35:02 +09:00
Derrick Timmermans
61078e9ae1
Use 0.2f instead of .2f
2020-11-22 18:59:16 +01:00
Derrick Timmermans
ba7ce4c933
Make colour readonly
2020-11-22 18:37:49 +01:00
Derrick Timmermans
458016d17d
Remove AccentColour member variable from LogoVisualisation
2020-11-22 17:36:59 +01:00
Derrick Timmermans
1551402a8d
Change IntroWelcome visualiser to use Colour instead of AccentColour
2020-11-22 17:33:40 +01:00
Derrick Timmermans
b468f061f1
Remove unused using
2020-11-22 17:20:00 +01:00
Derrick Timmermans
cc33b0f2c6
Apply MenuGlow to Visualisation Colour instead of AccentColour
2020-11-22 16:53:53 +01:00
Bartłomiej Dach
b62a873502
Merge branch 'master' into remove-default-retry-balue
2020-11-22 10:54:40 +01:00
Bartłomiej Dach
875f986979
Remove default from base ResultsScreen too
2020-11-21 14:38:38 +01:00
Endrik Tombak
72d9da5fac
Apply review suggestions
2020-11-21 14:26:09 +02:00
Endrik Tombak
6c5a6b42e5
Only calculate recommended SR once
2020-11-21 14:09:32 +02:00
Endrik Tombak
944f3480c2
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
...
Conflicts:
osu.Game/OsuGameBase.cs
osu.Game/Screens/Select/DifficultyRecommender.cs
osu.Game/Screens/Select/SongSelect.cs
2020-11-21 14:01:01 +02:00
Dean Herbert
2db42f8e67
Remove default allowRetry parameter value from ResultsScreen
2020-11-20 14:35:44 +09:00
Dean Herbert
8c32d3f781
Don't play flair animations / sounds when watching autoplay or viewing a result directly
...
I think this is a pretty good place to be for now. The flair will play
if you just watched a play (local, replay or spectator) but will not
play if you are coming from song select (viewing a replay's result
screen from the leaderboard) or in the case of autoplay.
Closes #10762 .
2020-11-20 14:32:31 +09:00
Bartłomiej Dach
6356b2dde9
Prevent editor from crashing for rulesets with no compose screen implementation
2020-11-19 22:11:52 +01:00
smoogipoo
f00c23b4a0
Add comment + xmldoc
2020-11-18 13:37:15 +09:00
smoogipoo
783c172b5d
Make sealed and cleanup comparator
2020-11-18 13:33:22 +09:00
smoogipoo
58c8184ad7
Define blueprint order similarly to hitobjects
2020-11-17 22:56:31 +09:00
Dean Herbert
7b79b9b9c1
Merge branch 'master' into fix-quick-delete-crash
2020-11-16 13:54:54 +09:00
Bartłomiej Dach
399a1a16a0
Refactor beginClickSelection in a slightly different way
2020-11-15 21:06:47 +01:00
kamp
1db303b159
Revert beginClickSelection logic
2020-11-15 16:54:48 +01:00
Dean Herbert
34f09e2e20
Merge branch 'master' into fix-spectator-preview-crash
2020-11-15 13:16:10 +09:00
Bartłomiej Dach
b344a13734
Add support for previewing tracks on spectator screen
2020-11-14 17:08:27 +01:00
Bartłomiej Dach
8a78d408db
Add more missed null checks
2020-11-14 15:52:12 +01:00
Bartłomiej Dach
610ed99ae3
Add null checks to unguarded resolved-as-null fields
2020-11-14 14:52:58 +01:00
kamp
4d2bc790fd
Fix crash on shift+right-click deleting objects
2020-11-14 13:20:16 +01:00
Bartłomiej Dach
d55eae55ad
Merge branch 'master' into fix-combo-break-rewind-replay
2020-11-13 21:46:32 +01:00
Bartłomiej Dach
405407ff9e
Merge branch 'master' into fix-combo-break-sounds
2020-11-13 21:07:34 +01:00
smoogipoo
0219aff7bc
Add timeline visible range adjustment
2020-11-13 17:10:29 +09:00
smoogipoo
3957697c48
Add pooling support to the editor
2020-11-13 17:08:20 +09:00
smoogipoo
4ef2e9548c
Pass HitObjectComposer to BlueprintContainer via ctor
2020-11-13 16:59:37 +09:00
Dean Herbert
4b5743d993
Fix combo break sound not playing after rewind
2020-11-13 13:38:14 +09:00
Dean Herbert
43626573df
Fix combo break sounds playing when seeking
2020-11-13 13:36:19 +09:00
smoogipoo
6f7a1dd57d
Merge branch 'master' into hitobject-pooling-base
2020-11-11 17:09:18 +09:00
Dean Herbert
11cf04eed1
Fix frames potentially getting added to spectator replay in wrong format
...
The way spectator currently works, the `Spectator` screen is responsible
for adding new frames to the replay, even when it has a child
(`SpectatorPlayer`) present.
There was a possibility that a new play had already started, and on
returning to the Spectator screen (to initialise the new play) there
would be a brief period where the Player instance is still reading from
the replay, the `userBeganPlaying` call had not yet finished
initialising the new target replay, and `userSentFrames` is run
(asynchronously), writing frames to the previous replay using the
incorrect ruleset instance).
To make this work, it doesn't `Schedule` frame addition to the replay
(making things a bit unsafe). Changing this itself isn't such a simple
one to do, so I instead opted to fix this via locking.
Closes https://github.com/ppy/osu/issues/10777 .
2020-11-11 13:39:43 +09:00
Bartłomiej Dach
546249b071
Temporarily fix crash on deleting control point groups
2020-11-10 21:32:47 +01:00
smoogipoo
66213f2ed0
Add pooling support to DrawableRuleset + Playfield
2020-11-10 23:56:32 +09:00
Dean Herbert
de6fcd1792
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 17:16:28 +09:00
Dean Herbert
a012105dac
Fix editor quick delete being triggerable from left mouse button
...
Closes https://github.com/ppy/osu/issues/10629 .
2020-11-10 16:54:37 +09:00
Dean Herbert
85d641c630
Merge pull request #10740 from Game4all/add-multi-statuses
2020-11-10 14:23:26 +09:00
Lucas A
b8c63e7944
Apply review suggestions.
2020-11-09 13:39:50 +01:00
Dan Balasescu
a2877fb00a
Merge pull request #10730 from peppy/fix-patcher-no-object-crash
...
Fix legacy patcher crash on no objects present
2020-11-09 18:51:00 +09:00
Lucas A
e44951969f
Use ??= operator instead of null check.
2020-11-08 18:22:19 +01:00
Lucas A
d8d4022119
Precise XMLDoc
2020-11-08 14:39:56 +01:00
Lucas A
48fce8c4b9
Add user activities to multi subscreens.
2020-11-08 13:21:21 +01:00
Lucas A
89b98b5388
Make multiplayer screen handle user activity updates from subscreens.
2020-11-08 13:16:27 +01:00
Lucas A
55070556a7
Move activity setup to BDL.
2020-11-08 12:53:19 +01:00
Lucas A
790a2ca97d
Extract UserActivity logic to OsuGame.
2020-11-08 12:29:52 +01:00
Bartłomiej Dach
ddbd6df24d
Unbind bindable lists for general safety
2020-11-07 20:59:57 +01:00
Bartłomiej Dach
e078b78dcc
Ensure callbacks don't fire when restoring default beatmap
2020-11-07 20:59:57 +01:00
Dean Herbert
b0052210b6
Add asserts of HitObjects indices
2020-11-08 00:18:38 +09:00
Dean Herbert
84e090583d
Merge pull request #10712 from peppy/move-cache-logic-to-base-impl
...
Move cache and lookup logic to base MemoryCachingComponent class
2020-11-07 00:06:43 +09:00
Dan Balasescu
f230250faf
Merge branch 'master' into editor-slider-control-point-quick-delete
2020-11-06 21:47:37 +09:00
Dean Herbert
9bb32f0914
Merge branch 'master' into move-cache-logic-to-base-impl
2020-11-06 16:56:35 +09:00
Dean Herbert
c5b172d0dd
Remove synchronous lookup path from BeatmapDifficultyCache
2020-11-06 14:53:15 +09:00
Dan Balasescu
972fc54c2d
Merge pull request #10710 from peppy/user-id-as-int
...
Use int instead of long for user_id fields for now
2020-11-06 14:35:14 +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
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
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
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
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
