Dean Herbert
37d550f42a
Merge pull request #11035 from smoogipoo/add-playlist-length
2020-12-03 18:39:54 +09:00
Dean Herbert
1c15c4bcee
Merge pull request #11072 from peppy/update-framework
2020-12-03 18:32:45 +09:00
smoogipoo
8245bb85dc
Invoke on initial bind
2020-12-03 18:06:55 +09:00
smoogipoo
62b1e37f73
Use async overloads
2020-12-03 18:04:53 +09:00
smoogipoo
3e62da119e
Add to inspector also
2020-12-03 17:59:39 +09:00
Dean Herbert
c64343c7d7
Update framework
2020-12-03 17:42:41 +09:00
Dean Herbert
d7cfaa38f1
Merge branch 'master' into hit-sample-pooling
2020-12-03 17:08:13 +09:00
Dean Herbert
3550e5b30f
Add length display to room screen as well
2020-12-03 16:42:06 +09:00
smoogipoo
31f7f7072d
Fix song select panels not loading if partially offscreen
2020-12-03 15:13:20 +09:00
Dean Herbert
897f593b37
Fix beatmap carousel panels getting masked away when out of scroll bounds
...
Regressed in https://github.com/ppy/osu/pull/10973 due to removed masking specification.
Closes #11067 .
2020-12-03 13:26:28 +09:00
ekrctb
6c46046c24
Fix DHO expires while hit sound is playing
2020-12-03 12:32:49 +09:00
Dean Herbert
a5bb194cb8
Merge pull request #11060 from FamousPig/fix-raw-input
...
Fix MouseHandler not being ignored when Raw Input is enabled
2020-12-03 12:15:51 +09:00
Bartłomiej Dach
7fd385efe6
Remove unused using directive
2020-12-02 20:01:58 +01:00
Leon Gebler
a2a10d4e13
Don't use nameof(MouseHandler)
2020-12-02 19:45:59 +01:00
Leon Gebler
bbde1f6b9c
Fix MouseHandler not being ignored when raw input is enabled
2020-12-02 18:56:59 +01:00
Bartłomiej Dach
2b828faecb
Merge branch 'master' into update-resources
2020-12-02 18:07:46 +01:00
Lucas A
827e957568
Allow importing osz files / osk files from Downloads directory.
2020-12-02 18:03:49 +01:00
smoogipoo
d5dccbc3d7
Fix spectator not being thread-safe
2020-12-02 19:13:09 +09:00
Dean Herbert
32188418f4
Update resources
2020-12-02 15:28:39 +09:00
Dan Balasescu
297283491a
Merge pull request #11031 from peppy/editor-fix-beat-snapping-new-beatmap
...
Fix editor beat snapping not working correctly when starting with a new beatmap
2020-12-02 15:17:09 +09:00
smoogipoo
e831c797f3
Merge branch 'master' into hit-sample-pooling
2020-12-02 14:45:24 +09:00
Dean Herbert
71a121389b
Merge pull request #11033 from smoogipoo/immutable-hit-samples
...
Make HitSampleInfo immutable
2020-12-02 14:44:26 +09:00
Dan Balasescu
bd4d4c5355
Merge pull request #10983 from ekrctb/pseudo-random
...
Add `StatelessRNG` to be used for randomly-looking visual elements
2020-12-02 14:42:22 +09:00
Dean Herbert
d6e0dc2216
Merge branch 'master' into editor-fix-beat-snapping-new-beatmap
2020-12-02 14:37:00 +09:00
Dean Herbert
e84dab8589
Move new beatmap construction above beat divisor binding
2020-12-02 14:36:52 +09:00
Dan Balasescu
2e0fdf9bca
Merge pull request #11011 from ekrctb/catch-pooling-initial
...
Initial implementation of hit object pooling in osu!catch ruleset
2020-12-02 13:02:22 +09:00
smoogipoo
2de3e655e0
Rename NextUlong -> NextULong
2020-12-02 12:59:45 +09:00
Dean Herbert
0cd404b6d3
Merge pull request #11051 from smoogipoo/update-dependencies
...
Update dependencies
2020-12-02 12:56:29 +09:00
Dan Balasescu
878ded4dd6
Merge pull request #11032 from peppy/editor-fix-ticks-updating-after-timing-change
...
Fix timeline not updating ticks correctly after arbitrary timing control point changes
2020-12-02 10:58:44 +09:00
smoogipoo
2150cf1c52
Rename parameters
2020-12-02 10:55:48 +09:00
smoogipoo
e19ef9627a
Fix potentially incorrect override
2020-12-02 10:54:26 +09:00
smoogipoo
9ac310c1c4
Merge remote-tracking branch 'upstream/dependabot/nuget/Dapper-2.0.78' into update-dependencies
2020-12-02 10:37:40 +09:00
smoogipoo
4a5b707104
Merge remote-tracking branch 'upstream/dependabot/nuget/Sentry-2.1.8' into update-dependencies
2020-12-02 10:37:21 +09:00
smoogipoo
728574f0c7
Merge remote-tracking branch 'upstream/dependabot/nuget/System.ComponentModel.Annotations-5.0.0' into update-dependencies
2020-12-02 10:37:19 +09:00
Dan Balasescu
9d71095a2b
Merge pull request #11004 from Yoyolick/master
...
Add ability to customise key binding for in-game overlay toggle
2020-12-02 10:34:24 +09:00
dependabot-preview[bot]
989ddd40b4
Bump System.ComponentModel.Annotations from 4.7.0 to 5.0.0
...
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/runtime ) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases )
- [Commits](https://github.com/dotnet/runtime/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:13 +00:00
dependabot-preview[bot]
249793d10a
Bump Sentry from 2.1.6 to 2.1.8
...
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet ) from 2.1.6 to 2.1.8.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases )
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md )
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.6...2.1.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:09 +00:00
dependabot-preview[bot]
64dfa9f928
Bump Dapper from 2.0.35 to 2.0.78
...
Bumps [Dapper](https://github.com/StackExchange/Dapper ) from 2.0.35 to 2.0.78.
- [Release notes](https://github.com/StackExchange/Dapper/releases )
- [Commits](https://github.com/StackExchange/Dapper/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:06 +00:00
Pennek
477de1bab0
change min/max values
2020-12-02 01:11:24 +01:00
Lucas A
005fa3a7ee
Add ability to import files from a stream.
2020-12-01 20:28:15 +01:00
Bartłomiej Dach
94a8784e04
Allow editor change handler to be null
2020-12-01 20:08:31 +01:00
smoogipoo
598572195c
Add playlist length to match settings overlay
2020-12-01 19:57:25 +09:00
Dean Herbert
76035718bb
Merge pull request #11034 from peppy/update-framework
...
Update framework (with SDL2 default)
2020-12-01 18:32:10 +09:00
smoogipoo
2840405112
Volume should be 0 by default
2020-12-01 18:14:14 +09:00
smoogipoo
6b4a6c12c8
Fix bad equality comparer implementations
2020-12-01 18:13:53 +09:00
smoogipoo
c61f00525d
Ignore lookup types for JSON serialisation
2020-12-01 18:13:53 +09:00
smoogipoo
17560aeeea
Volume should be 0 by default
2020-12-01 18:09:28 +09:00
smoogipoo
dda4d76d72
Fix bad equality comparer implementations
2020-12-01 18:09:21 +09:00
smoogipoo
b780fdbe4c
Ignore lookup types for JSON serialisation
2020-12-01 18:08:59 +09:00
Dan Balasescu
1cea39ed55
Merge pull request #11017 from peppy/fix-song-select-temporary-selection-loss
...
Fix current beatmap temporarily becoming empty during ruleset change
2020-12-01 17:55:08 +09:00
Dean Herbert
285e62be9a
Bring code in line with SDL2 defaults
2020-12-01 17:47:07 +09:00
Dean Herbert
d5a60ed335
Update framework
2020-12-01 17:30:42 +09:00
smoogipoo
4900589af4
Remove unused method
2020-12-01 17:02:45 +09:00
Dean Herbert
190c6ef45e
Fix timeline not updating ticks correctly after arbitrary timing control point changes
2020-12-01 16:44:08 +09:00
Dean Herbert
2b268ee012
Fix editor beat snapping not working correctly when starting with a new beatmap
2020-12-01 16:16:26 +09:00
smoogipoo
2bb7484608
Merge branch 'immutable-hit-samples' into hit-sample-pooling
2020-12-01 16:05:28 +09:00
smoogipoo
199710b941
Implement equality comparers for HitSampleInfo
2020-12-01 16:04:08 +09:00
smoogipoo
5760e1c1fc
Make HitSampleInfo immutable
2020-12-01 15:37:51 +09:00
Dean Herbert
a147b7186d
Remove unnecessary call to updateVisibility
2020-12-01 14:01:34 +09:00
Dean Herbert
63ff722963
Fix code formatting
2020-12-01 14:00:54 +09:00
Ryan Zmuda
8f6607ffec
Merge branch 'master' into master
2020-11-30 21:42:15 -05:00
Ryan Zmuda
e102f2e8fa
Moved enum to bottom, change defualt bind to Shift-Tab, Fixed Notification
2020-11-30 21:38:16 -05:00
ekrctb
604619ba47
Generalize legacy skin player test.
2020-12-01 09:49:04 +09:00
ekrctb
588a5c2aff
Remove empty comment
2020-12-01 09:35:28 +09:00
Bartłomiej Dach
2c57deea2b
Trim double full-stop in xmldoc
2020-11-30 19:43:20 +01:00
Bartłomiej Dach
5fbe1823a0
Merge branch 'master' into editor-beat-snap-always
2020-11-30 18:39:22 +01:00
Dean Herbert
51741c4791
Merge branch 'master' into hit-sample-pooling
2020-11-30 22:25:28 +09:00
Dean Herbert
a852a27dfb
Fix current beatmap temporarily becoming empty during ruleset change
...
When changing the ruleset at song select, there was a scenario where it
would be set to default (empty) for one debounce length where this was
not actually required. This occurs when the currently selected beatmap
set has other difficulties which match the target ruleset, specifically.
2020-11-30 19:36:30 +09:00
Dan Balasescu
c0a9d88a14
Merge branch 'master' into settings-reduce-visual-clutter
2020-11-30 19:30:39 +09:00
Dan Balasescu
6c6540addf
Merge pull request #11008 from peppy/settings-remove-transparency
...
Remove semi-transparent backgrounds from settings and notifications overlays
2020-11-30 19:29:53 +09:00
smoogipoo
c29ad8edf8
Better API for dealing with the contained drawable samples
2020-11-30 19:26:25 +09:00
smoogipoo
f5e8d1d14d
Lose old reference immediately on updateSample()
2020-11-30 19:19:24 +09:00
Dean Herbert
7f34e11467
Merge pull request #10962 from smoogipoo/improve-dho-time-offsets
...
Fix judgement offsets in non-framestable contexts
2020-11-30 19:13:25 +09:00
ekrctb
51bddd4a0f
Rename functions, and add NextInt.
2020-11-30 18:46:28 +09:00
smoogipoo
afb8eb636d
Apply simple PR reviews
2020-11-30 18:40:22 +09:00
Dean Herbert
3ad2eeaff5
Fix outdated xmldoc
2020-11-30 18:35:30 +09:00
Dean Herbert
c17d67bc7d
Merge branch 'master' into editor-beat-snap-always
2020-11-30 18:34:38 +09:00
smoogipoo
4bbeb9ebd4
Merge branch 'master' into hit-sample-pooling
2020-11-30 18:31:58 +09:00
Dan Balasescu
b56e832e83
Merge pull request #10950 from ekrctb/pool-scrolling
...
Support hit object pooling in ScrollingPlayfield
2020-11-30 18:29:34 +09:00
ekrctb
731e689f2d
Add summary tags to the doc comments
2020-11-30 18:07:37 +09:00
smoogipoo
8f48389f89
Merge branch 'master' into improve-dho-time-offsets
2020-11-30 18:01:48 +09:00
Dean Herbert
965cc1f511
Remove unnecessary usings #2
2020-11-30 17:57:25 +09:00
Dean Herbert
46cab04929
Merge branch 'settings-remove-transparency' into settings-reduce-visual-clutter
2020-11-30 17:57:10 +09:00
Dan Balasescu
a3ef858f3a
Remove unnecessary multiplication
2020-11-30 17:56:04 +09:00
Dean Herbert
fe48b2279c
Adjust various paddings and spacings in settings to make them easier to visually parse
2020-11-30 17:50:35 +09:00
Dean Herbert
a3dd22f5c2
Merge branch 'master' into settings-remove-transparency
2020-11-30 17:50:26 +09:00
Dean Herbert
bf2c6dc241
Remove unused usings rider couldn't see
2020-11-30 17:49:55 +09:00
smoogipoo
7ac2fba127
More reordering of public vs private methods
2020-11-30 17:44:58 +09:00
Dan Balasescu
b0637cebd1
Merge branch 'master' into song-select-track-selected-better-2
2020-11-30 17:26:15 +09:00
Dan Balasescu
52cb30dff2
Merge pull request #10999 from bdach/user-interface-settings-section
...
Create "User Interface" settings section
2020-11-30 17:25:04 +09:00
Dean Herbert
a4e061cb11
Remove semi-transparent backgrounds from settings and notifications overlays
...
I tried also updating the colours to the "new" versions from designs but
they don't match due to colour profile differences (so I'm not yet sure
if they are correct or not) and also don't look great without all the UI
elements also being updated.
2020-11-30 17:19:55 +09:00
Dan Balasescu
11d1450c76
Merge branch 'master' into fruit-bindables
2020-11-30 16:48:22 +09:00
Dean Herbert
4e1e45f3e7
Move hold-to-confirm back to UI section
2020-11-30 16:15:35 +09:00
Dean Herbert
55c8aa5d5f
Move menu cursor size to UI section
2020-11-30 16:14:15 +09:00
Dean Herbert
e14db45374
Reorder settings to (probably) feel more correct
2020-11-30 16:09:38 +09:00
Dean Herbert
2745659986
Reword and xmldoc some comments
2020-11-30 15:54:20 +09:00
Dan Balasescu
69c2a18220
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-30 14:05:03 +09:00
Dan Balasescu
0c36a3c263
Merge branch 'master' into pool-scrolling
2020-11-30 14:04:54 +09:00
Dan Balasescu
5a276f8577
Merge branch 'master' into fix-editor-reapply-same-state-change
2020-11-30 13:34:03 +09:00
Ryan Zmuda
9145557522
Revert "Revert "forgot to remove something... sorry""
...
This reverts commit 6478bed431
2020-11-29 23:15:12 -05:00
Ryan Zmuda
6478bed431
Revert "forgot to remove something... sorry"
...
This reverts commit a780a8bbd8
2020-11-29 23:14:43 -05:00
Dan Balasescu
30dc0bc019
Merge pull request #10993 from LittleEndu/star-scale
...
Scale stars from 0.4 to 1
2020-11-30 13:05:44 +09:00
Ryan Zmuda
a780a8bbd8
forgot to remove something... sorry
2020-11-29 21:52:58 -05:00
Ryan Zmuda
3994cf082d
add keybind for in game overlay
2020-11-29 20:59:02 -05:00
Bartłomiej Dach
e0a84ff1dc
Move hold-to-confirm setting back to gameplay section
2020-11-29 22:07:34 +01:00
Bartłomiej Dach
a5c4a8d2e9
Create "User Interface" settings section
2020-11-29 22:07:33 +01:00
Bartłomiej Dach
4057ca0a57
Merge branch 'master' into fix-editor-unnecessary-object-updates
2020-11-29 21:34:17 +01:00
Bartłomiej Dach
a3afd88387
Use Interpolation.Lerp
2020-11-28 20:35:03 +01:00
Endrik Tombak
8ad4cf73f5
Scale stars from 0.4 to 1
2020-11-28 17:09:43 +02:00
PercyDan
579e61eab9
Allow null
2020-11-28 16:31:24 +08:00
Dean Herbert
7e34c5e239
Fix state application always checking newest state for early abort, rather than current
2020-11-27 16:57:11 +09:00
Dean Herbert
18bb0cb45b
Remove unnecessary schedule logic from Apply's local updateState call
...
There were cases in the editor where rewinding of transforms would
leave the `DrawableHitObject` in a non-`IsPresent` state, resulting in
this scheduled logic never running.
This would in turn cause ghost hitobjects, which disappear under certain
circumstances.
Reproduction:
- Open editor to empty beatmap
- Place single hitcircle at current point in time
- Drag editor timeline backwards to seek before zero, and wait for
return to zero
- Select hitcircle in playfield
- Drag hitcircle to right in timeline, triggering a start time change
2020-11-27 16:32:05 +09:00
Dean Herbert
7edbba58f7
Avoid updating hitobjects unnecessarily for start time changes
...
This was firing regardless of whether the start time was changed, such
as where beat snap provided the same time the object already has.
The case where a change actually occurs is already handled by
EditorBeatmap (see `startTimeBindables`), so it turns out this local
handling is not required at all.
2020-11-27 16:31:06 +09:00
ekrctb
a7194e1bc3
add stateless RNG
2020-11-27 15:43:44 +09:00
Dean Herbert
b9b8857988
Update framework
2020-11-27 15:11:07 +09:00
Dean Herbert
bcc197f9fe
Merge branch 'master' into improve-dho-time-offsets
2020-11-27 15:03:56 +09:00
Dean Herbert
792934f2c4
Allow scroll type to be specified
...
This brings back the ability for the carousel to scroll in a classic
way. It turns out this is generally what we want for "seek" operations
like "random", else it's quite hard to get the expected animation.
I did experiment with applying the animation after the pooled panels are
retrieved, but in a best-case scenario there is still a gap where no
panels are displayed during the random seek operation.
2020-11-27 13:54:38 +09:00
ekrctb
6e40de58e9
Use new OnAdd and OnRemove to invalidate DHO
2020-11-27 13:36:40 +09:00
ekrctb
8f5129323d
Merge branch 'master' into pool-scrolling
2020-11-27 13:12:05 +09:00
Dean Herbert
018957c244
Merge branch 'master' into song-select-track-selected-better-2
2020-11-27 12:54:40 +09:00
ekrctb
e36bb7631d
Fix colour not updated when index changes
2020-11-27 11:41:39 +09:00
ekrctb
57454bbb1c
Remove hitObject argument from OnApply and OnFree
2020-11-27 10:13:05 +09:00
Dean Herbert
5a393b153b
Merge pull request #10952 from peppy/replay-pausing-support
...
Add ability to pause/resume replay playback
2020-11-27 02:26:23 +09:00
Dean Herbert
94dc61150b
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-27 00:43:47 +09:00
Dean Herbert
b1864670a2
Merge pull request #10961 from smoogipoo/better-dho-rewind
...
Rewind pooled DHOs into better states
2020-11-27 00:42:58 +09:00
Dan Balasescu
220657c2cc
Merge branch 'master' into replay-pausing-support
2020-11-27 00:09:40 +09:00
Dan Balasescu
882fcdb13a
Merge pull request #10975 from peppy/standardise-binding-description-case
...
Standardise binding description case to sentence casing
2020-11-26 23:54:13 +09:00
smoogipoo
aa4da2a5f8
Add xmldoc on State
2020-11-26 23:42:05 +09:00
Dean Herbert
1e79cb498b
Standardise binding description case to sentence casing
2020-11-26 20:07:16 +09:00
Dean Herbert
3346c06aca
Rename variable/text to be more verbose as to toggle purpose
2020-11-26 20:04:44 +09:00
Dean Herbert
741902f1b3
Merge pull request #10971 from smoogipoo/fix-timeline-combo-colour
...
Fix timeline blueprints sometimes not receiving combo colours
2020-11-26 19:47:21 +09:00
Dean Herbert
da6bccc812
Apply beat snap if positional snap doesn't give a time result
2020-11-26 19:20:51 +09:00
Dean Herbert
91592cf32d
Expose EditorClock for consumption
2020-11-26 19:20:39 +09:00
Dean Herbert
9811c46e35
Rename application method to better describe what it actually does
2020-11-26 19:16:18 +09:00
ekrctb
05e245d445
Allow non-pooled DHO to be reused
2020-11-26 19:07:09 +09:00
Dean Herbert
0a48dd8f76
Delegate scroll animation to panels themselves
2020-11-26 18:42:51 +09:00
Dean Herbert
ad258e2e52
Update scroll position before applying any panel animations
...
In the case of automatic scroll requirements (ie. scroll to selected) we
are delegating the animation logic to the panels themselves. In order to
make this work correctly, the scroll operation needs to take effect
before any animation updates are run.
2020-11-26 18:33:41 +09:00
Dean Herbert
6058c66edb
Move drawable carousel set movement logic into panels themselves
2020-11-26 18:32:43 +09:00
Dean Herbert
f8db7a9902
Remove ScrollableContent container from carousel
...
This was causing multiple issues with masking and sizing and really
didn't need to exist in the first place. Also not sure why the pool was
nested inside the scroll container, but it isn't any more. Probably for
the best.
2020-11-26 18:28:54 +09:00
Dean Herbert
02d5b1352b
Expose generic version of OsuScrollContainer
2020-11-26 18:25:56 +09:00
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
Dan Balasescu
a0e47ae13f
Merge pull request #10960 from peppy/fix-editor-volume-adjust
...
Fix volume not being adjustable in the editor using alt-scroll
2020-11-26 15:37:57 +09:00
ekrctb
eae33fe74a
Fix format
2020-11-26 14:16:33 +09:00
ekrctb
e43f928588
Use DHO.HitObjectApplied to invalidate computation
2020-11-26 14:07:40 +09:00
ekrctb
f6faf95e33
Revert changes to HitObjectUsageBegan, not use it.
2020-11-26 14:01:46 +09:00
ekrctb
1a6e5bdaba
Merge branch 'master' into pool-scrolling
2020-11-26 13:52:52 +09:00
Bartłomiej Dach
8ff1688c4b
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-25 20:11:09 +01:00
smoogipoo
0414e5c550
Add MaximumJudgementOffset to DrawableHitObject, use in more places
2020-11-26 01:12:42 +09:00
smoogipoo
c744db1b57
Rewind pooled DHOs into better states
2020-11-26 00:42:25 +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
c46d655832
Uncomment incorrectly commented lines
2020-11-25 12:11:44 +09:00
PercyDan54
0009724c1a
Fix CI
2020-11-24 18:48:32 +08:00
ekrctb
b8a5cd94f7
Invoke HitObjectUsageFinished before removal
2020-11-24 19:46:57 +09:00
PercyDan54
739c18a34d
dotnet format
2020-11-24 18:25:38 +08:00
Dan Balasescu
4311526c0a
Merge branch 'master' into on-drawable-hitobject-added
2020-11-24 19:23:54 +09:00
PercyDan54
7ab27399bf
Fix CI errors
2020-11-24 18:04:34 +08:00
ekrctb
e34a205104
Rewrite hit object management, take three
2020-11-24 18:56:05 +09:00
ekrctb
7f6e4d5b21
Delay lifetime computation until loaded
2020-11-24 18:56:05 +09:00
ekrctb
d5f082e5fb
Comment about lifetime assumption
2020-11-24 18:56:05 +09:00
ekrctb
ce57e8ddfb
Separate Lifetime computation and layout update
2020-11-24 18:56:05 +09:00
ekrctb
cabc8aa63b
Revert "Simplify ScrollingHitObjectContainer logic"
...
This reverts commit b4cc39149c117e6a0e95ee917a67cec8ba723d06.
2020-11-24 18:56:05 +09:00
ekrctb
8f39b54e58
Simplify ScrollingHitObjectContainer logic
2020-11-24 18:56:05 +09:00
ekrctb
5c743adbae
Support hit object pooling scrolling playfield
2020-11-24 18:56:05 +09:00
PercyDan54
0b735b84cf
Remove unused enum
2020-11-24 17:23:53 +08:00
PercyDan54
07ee36a4ef
Simplify code
2020-11-24 17:18:19 +08:00
Dean Herbert
d5a4d46c6d
Merge pull request #10842 from EVAST9919/profile-overlay-graph-new
...
Implement history charts for Profile Overlay
2020-11-24 18:05:17 +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
Dan Balasescu
87ce8a53ff
Merge branch 'master' into on-drawable-hitobject-added
2020-11-24 16:09:57 +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
1682260677
Remove left over logging line
2020-11-24 15:28:03 +09:00
Dean Herbert
ee33f62809
Fix DrawableJudgement not always animating correctly on skin change
...
If the skin is changed before gameplay has started (at the loading
screen) it is possible for a sequence of events to occur which results
in the animation not being played:
- `SkinReloadableDrawable` runs its BDL load (and calls `OnSkinChanged`
once)
- User changes skin, triggering `DrawableJudgement`'s skin change
handling (binding directly on the `SkinSource` locally)
- This will call `PrepareDrawables` and reinitialise the
`SkinnableDrawable` child hierarchy, then immediately apply the
animations to it.
- The new `SkinnableDrawable` will then get the `SkinChanged` event and
schedule a handler for it, which will run on its first Update call.
- Any added animations will be lost as a result.
Fixed by binding directly to the `SkinnableDrawable`'s `OnSkinChanged`.
This has the added bonus of not needing to reinitialise the child
hierarchy on skin change (which felt a bit weird in the first place).
2020-11-24 15:23:53 +09:00
Dan Balasescu
57ff150051
Merge pull request #10829 from Joehuu/music-osd-bindings
...
Add music bindings to on screen display
2020-11-24 14:36:34 +09:00
Joehu
1fd4b04767
Just set music shortcut text locally
2020-11-23 20:43:46 -08:00
Dean Herbert
e36b1051c1
Add spacing between inline comments
2020-11-24 13:15:59 +09:00
Dean Herbert
82640418ba
Invert hide logic for readability
2020-11-24 13:12:04 +09:00
Dean Herbert
44ca67c534
Simplify fill logic and add xmldoc
2020-11-24 13:10:11 +09:00
Dean Herbert
37ea65de2a
Merge branch 'master' into profile-overlay-graph-new
2020-11-24 12:52:59 +09:00
Joehu
52f5473cc0
Set global action as a parameter in toast
2020-11-23 15:13:58 -08:00
Bartłomiej Dach
5701b32bae
Handle constant graphs better
2020-11-23 22:12:32 +01:00
Bartłomiej Dach
8347ecf494
Simplify row tick creation code
2020-11-23 21:52:47 +01:00
Bartłomiej Dach
7b0d3dfe0c
Refactor tick calculation code for readability
2020-11-23 21:38:04 +01:00
Bartłomiej Dach
bb5aa9a9c9
Guard against empty values early
2020-11-23 21:24:37 +01:00
Bartłomiej Dach
e9ffeb8b5d
Make missing date check more robust
2020-11-23 21:09:42 +01:00
Dean Herbert
060acb9010
Merge pull request #10935 from bdach/fix-mania-judgement-fade-in
...
Rewind judgement transforms before clearing
2020-11-23 17:05:04 +09:00
Dean Herbert
5e014fc4fe
Merge pull request #10941 from LumpBloom7/improve-MenuVisualizer
...
Improve LogoVisualisation looks when MenuGlow colors are used
2020-11-23 15:25:18 +09:00
Dean Herbert
19faa2b9bb
Add comment covering intentional call to ClearTransformsAfter
2020-11-23 15:20:59 +09:00
Andrei Zavatski
1b33d30039
Simplify horizontal ticks creation
2020-11-23 08:52:29 +03:00
Andrei Zavatski
42741895e6
Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-overlay-graph-new
2020-11-23 08:41:57 +03:00
Dean Herbert
898e2dae27
Restore kiai time flashing behaviour
2020-11-23 14:27:02 +09:00
Dean Herbert
5662e722ed
Merge pull request #10936 from bdach/fix-follow-points-getting-stuck
...
Fix legacy follow point animations not playing after a while
2020-11-23 14:14:00 +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
827a089810
Merge branch 'master' into change-taiko-ez
2020-11-22 13:29:02 +01:00
Bartłomiej Dach
1c31a4a6b6
Expose animation start time as mutable in interface
2020-11-22 13:11:22 +01:00
Bartłomiej Dach
b62a873502
Merge branch 'master' into remove-default-retry-balue
2020-11-22 10:54:40 +01:00
ekrctb
666112cb5a
Address @bdach's minor suggestions
2020-11-22 18:51:16 +09:00
ekrctb
c506b438bf
Remove more code and make some methods private
2020-11-22 18:51:16 +09:00
Dean Herbert
a3b1d14f17
Apply similar fix to PoolableSkinnableSound
2020-11-22 14:44:39 +09:00
Andrei Zavatski
b745fb681a
Fix incorrect static using placement
2020-11-22 04:40:55 +03:00
Andrei Zavatski
4887132947
Adjustments for edge cases support
2020-11-22 04:28:17 +03:00
Andrei Zavatski
f07f8089d6
Adjust monthsPerTick value
2020-11-22 03:58:56 +03:00
Andrei Zavatski
e6c116f0ab
Rework horizontal ticks creation
2020-11-22 03:49:00 +03:00
Andrei Zavatski
6e581902cd
Simplify column ticks creation
2020-11-22 03:11:38 +03:00
Andrei Zavatski
453f0ba675
Make tick lines thicker
2020-11-22 02:34:29 +03:00
Andrei Zavatski
3cb1d04667
Move dates fill into it's own method
2020-11-22 02:25:12 +03:00
Andrei Zavatski
d4b56aac84
Add missing whitespace
2020-11-22 02:17:54 +03:00
Andrei Zavatski
9d7ddf8343
Merge master with conflicts resolved
2020-11-22 02:13:35 +03:00
Andrei Zavatski
fe4c622041
Make OnUserChanged private
2020-11-21 23:13:46 +03:00
Andrei Zavatski
dbfc839df3
Move missing text to PaginatedProfileSubsection
2020-11-21 23:03:54 +03:00
Andrei Zavatski
11c3ccfcaa
Move rulesets property to PaginatedProfileSubsection
2020-11-21 22:49:56 +03:00
Bartłomiej Dach
240c1b0aef
Add support for changing animation start time after load
2020-11-21 20:06:30 +01:00
Bartłomiej Dach
9f997db958
Rewind judgement transforms before clearing
2020-11-21 17:56:49 +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
ekrctb
295ca38cda
Merge remote-tracking branch 'origin/master' into on-drawable-hitobject-added
2020-11-21 15:25:16 +09:00
ekrctb
4345d8dcb6
Event -> virtual method
2020-11-21 15:20:33 +09:00
ekrctb
281ed49332
Add HasInitialized to DHO
...
As it turned out, `IsLoaded` is not a reliable way.
2020-11-21 11:19:52 +09:00
Andrei Zavatski
718ba9253b
Implement ProfileSubsection component
2020-11-21 03:18:24 +03:00
Andrei Zavatski
c4cb1440ab
Rename PaginatedContainerHeader to ProfileSubsectionHeader
2020-11-21 02:59:01 +03:00
ekrctb
82aefa3868
Rework and rename to OnNewDrawableHitObject.
...
The semantics is changed and hopefully more clear.
2020-11-21 00:27:19 +09:00
smoogipoo
9520cf6481
Merge branch 'master' into fix-judgement-ordering
2020-11-20 22:49:33 +09:00
Dan Balasescu
58fc61aa95
Merge branch 'master' into legacy-judgement-particles
2020-11-20 22:19:11 +09:00
Dan Balasescu
8785da1b41
Merge pull request #10917 from peppy/no-applause-on-autoplay
...
Don't play flair animations / sounds when watching autoplay or viewing a result directly
2020-11-20 21:48:10 +09:00
Dan Balasescu
79752bcb19
Merge branch 'master' into legacy-jugement-match-stable-transforms
2020-11-20 20:51:27 +09:00
Dean Herbert
8080fe942c
Fix samples being played more than once on skin change
2020-11-20 20:38:26 +09:00
ekrctb
772f6df668
Add a remark for DrawableHitObjectAdded
2020-11-20 18:00:00 +09:00
ekrctb
c013cd11c9
Add DrawableHitObjectAdded event
2020-11-20 17:56:47 +09:00
Dean Herbert
53b6d90ab4
Don't show default judgements in front of objects for now
2020-11-20 16:30:58 +09:00
Dean Herbert
a00e0d7279
Move CanBeNull specification to the interface
2020-11-20 16:30:48 +09:00
Dean Herbert
7fe0923fcf
Show main judgement content above hitobjects
2020-11-20 16:25:48 +09:00
Dean Herbert
0e9999ecb1
Merge branch 'remove-dead-playfield-code' into fix-judgement-ordering
2020-11-20 16:12:48 +09: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
Dean Herbert
1df3f88fc4
Update framework
2020-11-20 12:32:17 +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
7c83a27002
Add more xmldocs
2020-11-19 22:48:21 +09:00
smoogipoo
8a656f7cee
Fix missing SkinChanged event + safety
2020-11-19 22:42:44 +09:00
smoogipoo
a53848ef9b
Fix storyboard imlpementation
2020-11-19 22:30:41 +09:00
smoogipoo
d388c44428
Cleanup, refactoring, and restart sample on skin change
2020-11-19 22:30:21 +09:00
smoogipoo
7180bfe4ba
Unlimit number of samples per pool
2020-11-19 21:21:57 +09:00
smoogipoo
0287269b2f
Fix volume discrepancies
2020-11-19 21:21:30 +09:00
smoogipoo
f013928fa3
Set maximum pool size
2020-11-19 20:40:01 +09:00
smoogipoo
70cb197957
Cleanups
2020-11-19 20:38:36 +09:00
smoogipoo
812d5d59b1
Fix looping not being propagated
2020-11-19 20:29:09 +09:00
smoogipoo
8920534a25
Fix pools not being added to hierarchy
2020-11-19 20:24:03 +09:00
smoogipoo
003fed857c
Separate files
2020-11-19 19:52:34 +09:00
smoogipoo
730b14b5bb
Add initial hit sample pooling
2020-11-19 19:51:09 +09:00
Dean Herbert
1c7ee2ca5f
Simplify math by making direction a float
2020-11-19 18:46:19 +09:00
Dean Herbert
84e73e88d5
Use structs for parts for added safety
2020-11-19 18:08:54 +09:00
Dean Herbert
3a7291c5cf
Fix some behavioural regressions
2020-11-19 17:56:11 +09:00
Dean Herbert
476d0256cc
Replace particle explosion implementation with DrawNode version
2020-11-19 17:22:37 +09:00
Dean Herbert
83024f1ec5
Add back positional randomness from stable
2020-11-19 16:00:20 +09:00
Dean Herbert
efd5acb8ab
Randomise direction every animation playback
2020-11-19 15:55:11 +09:00
Dean Herbert
9d04ce75cc
Make particles additive and consume in judgement explosions
2020-11-19 15:47:02 +09:00
Dean Herbert
9df93e1f18
Add basic implementation of particle explosion
...
Using drawables still, just to get things in place and setup the
structure
2020-11-19 14:54:33 +09:00
Dean Herbert
7f3c8ad744
Merge pull request #10872 from smoogipoo/fix-missing-triangles
2020-11-19 14:11:08 +09:00
Dean Herbert
ba735584fa
Add null check for disposal safety
2020-11-19 14:04:43 +09:00
Dean Herbert
85c5c68dfa
Provide particle drawable as a function (for future use)
2020-11-19 13:20:21 +09:00
Bartłomiej Dach
24d7fa03d8
Merge branch 'master' into legacy-jugement-match-stable-transforms
2020-11-18 20:33:58 +01:00
Bartłomiej Dach
5156de3a10
Merge branch 'master' into fix-judgement-transform-logic
2020-11-18 19:20:11 +01:00
Dean Herbert
ecd6d09600
Merge pull request #10891 from smoogipoo/remove-obsoletes
...
Remove obsolete method
2020-11-18 23:07:31 +09:00
Dan Balasescu
9f6ca06039
Merge pull request #10889 from peppy/return-null-if-skinnable-sprite-no-exist
...
Fix SkinnableSprite initialising a drawable even when the texture is not available
2020-11-18 21:35:13 +09:00
smoogipoo
cb5d1d0d77
Remove obsolete method
2020-11-18 21:26:35 +09:00
Dean Herbert
b3bec81b79
Update xmldoc to match new behaviour
2020-11-18 19:38:38 +09:00
Dean Herbert
8522ddc61e
Reduce nesting of skinned component to reduce exposed surface
2020-11-18 19:34:27 +09:00
PercyDan54
9a3dd12f30
Move to debug settings
2020-11-18 18:15:56 +08:00
Dean Herbert
ee8804b50b
Fix animation playback not running on skin change
2020-11-18 19:03:34 +09:00
Dean Herbert
c47e70da9b
Update animations for new/old miss style and add fades
2020-11-18 19:03:34 +09:00
Dean Herbert
9d3de5bca0
Fix hit lighting dictating lifetime even when not present in skin
2020-11-18 19:03:34 +09:00
Dean Herbert
9d0a6de26e
Fix SkinnableSprite initialising a drawable even when the texture is not available
2020-11-18 19:03:34 +09:00
Dean Herbert
72a15ef2dc
Handle DrawableJudgement lifetime more flexibly
2020-11-18 19:03:34 +09:00
Dean Herbert
94886a09b2
Remove fades from DrawableJudgement itself
2020-11-18 19:03:34 +09:00
Dean Herbert
5bd4ace37f
Split out new and old style legacy judgement pieces
2020-11-18 19:03:34 +09:00
Dean Herbert
8be31f4805
Adjust legacy skin judgement transforms to match stable
2020-11-18 19:03:05 +09:00
Dean Herbert
8ccb399eff
Merge pull request #10883 from smoogipoo/defined-blueprint-order
2020-11-18 18:46:37 +09:00
Dean Herbert
bb1aacb360
Fix SkinnableSprite initialising a drawable even when the texture is not available
2020-11-18 18:07:00 +09:00
Dean Herbert
efc18887c8
Update framework
2020-11-18 18:01:55 +09: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
Bartłomiej Dach
57eaee27ae
Rename param to match type better
2020-11-17 20:12:04 +01:00
Bartłomiej Dach
875d7dec79
Remove redundant this. qualifier
2020-11-17 20:11:13 +01:00
smoogipoo
58c8184ad7
Define blueprint order similarly to hitobjects
2020-11-17 22:56:31 +09:00
PercyDan54
dcaebd2621
Add license text
2020-11-17 21:39:29 +08:00
PercyDan54
809338a280
Init Import screen
2020-11-17 20:19:12 +08:00
Dean Herbert
dd4b69feab
Add legacy judgement implementation which doesn't transform on animations
2020-11-17 15:46:57 +09:00
Dean Herbert
8247e6ce91
Move result type to ctor
2020-11-17 15:43:54 +09:00
Dean Herbert
e4f1e52422
Add xmldoc coverage of Apply()
2020-11-17 15:03:26 +09:00
Dean Herbert
f465dd5a5e
Move all extended animation logic out of DrawableJudgement
2020-11-17 14:59:34 +09:00
Dean Herbert
d7b6e4a32d
Merge pull request #10867 from smoogipoo/refactor-user-request
...
Refactor user caching to improve readability and fix threadsafety issues
2020-11-17 14:20:45 +09:00
Dean Herbert
9dfa4249e0
Make Apply non-virtual
2020-11-17 14:05:13 +09:00
smoogipoo
3bcf9c255a
Add Triangles.Reset()
2020-11-17 13:06:30 +09:00
smoogipoo
33c643e369
Add obsoletion for unused property
2020-11-17 12:23:34 +09:00
Dean Herbert
009d666241
Use dictionary to avoid linq overhead
2020-11-17 10:57:11 +09:00
Bartłomiej Dach
8da40ce2dc
Reduce duplication by extracting ModEasyWithExtraLives
2020-11-16 19:54:00 +01:00
Bartłomiej Dach
128adce017
Merge branch 'master' into change-taiko-ez
2020-11-16 19:37:47 +01:00
Bartłomiej Dach
72a8734f93
Merge branch 'master' into add-back-initiallifetimeoffset
2020-11-16 18:54:37 +01:00
smoogipoo
e8dbc190f1
Remove ability to pool DHOs in parent playfields
2020-11-16 23:30:24 +09:00
smoogipoo
cead67d512
Add back removed InitialLifetimeOffset removal
2020-11-16 21:49:29 +09:00
smoogipoo
85b0f71467
Handle duplicate user IDs within the same batch
2020-11-16 21:17:43 +09:00
smoogipoo
87bf168718
Use queue instead of list
2020-11-16 20:52:51 +09:00
smoogipoo
1b1f4c9c09
Refactor user request to fix threadsafety issues
2020-11-16 20:35:22 +09:00
PercyDan54
f2ef7bee5d
Fix checks
2020-11-16 18:17:50 +08:00
PercyDan54
d7acfd5413
Remove retires from ModEasy
2020-11-16 18:15:15 +08:00
Dan Balasescu
a98327f0c5
Merge branch 'master' into fix-currentskininfo-thread-safety
2020-11-16 17:55:22 +09:00
Dan Balasescu
09298139e1
Merge pull request #10844 from bdach/spinner-rotation-tracker-state
...
Fix rotation tracker state not being reset on drawable spinner re-use
2020-11-16 17:10:40 +09:00
Dean Herbert
709370c69b
Move schedule call outwards
2020-11-16 16:49:31 +09:00
Dean Herbert
9a7fdb2b7e
Move skin deletion logic to OsuGameBase to promote thread safety
...
`CurrentSkinInfo` is used in multiple places expecting thread safety,
while ItemRemoved events are explicitly mentioning they are not thread
safe. As SkinManager itself doesn't have the ability to schedule to the
update thread, I've just moved the logic to `OsuGameBase`. We may want
to move the current skin bindable out of the manager class in the
future to match things like `BeatmapManager`.
Closes https://github.com/ppy/osu/issues/10837 .
2020-11-16 16:43:19 +09:00
Dean Herbert
6706840b54
Merge pull request #10853 from bdach/add-to-legacy-conversion-tests
2020-11-16 15:22:04 +09:00
Dean Herbert
baed1573dc
Merge pull request #10838 from nbvdkamp/fix-quick-delete-crash
2020-11-16 14:42:52 +09:00
Dan Balasescu
3dbd7d5654
Merge pull request #10856 from bdach/reset-transforms-on-return-to-pool
...
Clear DrawableHitObject transforms on return to pool
2020-11-16 14:40:38 +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
Bartłomiej Dach
9c0a0031d6
Clear existing transforms on DHO return to pool
2020-11-15 19:50:22 +01:00
kamp
1db303b159
Revert beginClickSelection logic
2020-11-15 16:54:48 +01:00
Bartłomiej Dach
5d44286d38
Add missing generic mappings to legacy mods
2020-11-15 15:35:06 +01:00
Bartłomiej Dach
5ace7abaa8
Add abstract non-generic ModNightcore to pattern-match over
2020-11-15 15:32:02 +01:00
Bartłomiej Dach
8b74298567
Add base method for testing conversion in other direction
2020-11-15 14:48:23 +01:00
Bartłomiej Dach
9899687bfe
Rename existing method to allow for new one
2020-11-15 14:17:41 +01:00
Dean Herbert
199043f677
Allow preview tracks to exist without an owner (without hard crashing)
2020-11-15 13:21:09 +09:00
Dean Herbert
34f09e2e20
Merge branch 'master' into fix-spectator-preview-crash
2020-11-15 13:16:10 +09:00
Bartłomiej Dach
f8cabbdd21
Clear result when freeing pooled hitobject
2020-11-14 21:09:22 +01:00
Andrei Zavatski
a52c98b55c
Fix broken test scene
2020-11-14 21:20:37 +03:00
Andrei Zavatski
fe9d17fc56
Fix CodeFactor issues
2020-11-14 20:31:03 +03:00
Andrei Zavatski
a94546f905
CI fixes
2020-11-14 20:17:32 +03:00
Andrei Zavatski
5354bf1fa5
Ticks distribution improvements
2020-11-14 20:07:52 +03:00
Andrei Zavatski
02168c6c2f
Implement dates with zero count fill
2020-11-14 19:17:01 +03:00
Bartłomiej Dach
b344a13734
Add support for previewing tracks on spectator screen
2020-11-14 17:08:27 +01:00
Andrei Zavatski
af174aa653
Implement chart subsections
2020-11-14 18:48:47 +03:00
Andrei Zavatski
c2a7f2f356
Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-overlay-graph-new
2020-11-14 18:21:12 +03:00
Andrei Zavatski
ae4a2e74fa
Implement ProfileSubsection
2020-11-14 18:21:10 +03: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
Dean Herbert
354e748e45
Merge branch 'master' into osu-hitobject-pooling-playfield
2020-11-14 15:44:00 +09:00
Andrei Zavatski
01f28a35c3
Implement vertical ticks creation
2020-11-14 07:28:01 +03:00
Andrei Zavatski
d98c59f2a4
Implement horizontal ticks creation
2020-11-14 06:38:02 +03:00
Andrei Zavatski
9d8e7e8954
ProfileLineChart layout implementation
2020-11-14 04:46:26 +03:00
Dean Herbert
52ff7b6593
Merge branch 'master' into hitobject-pooling-in-playfield
2020-11-14 10:27:12 +09:00
Joehu
2071cba944
Add music bindings to on screen display
2020-11-13 13:16:36 -08: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
Bartłomiej Dach
e6300f25d4
Merge branch 'master' into add-always-play-combo-break-setting
2020-11-13 20:25:55 +01:00
Bartłomiej Dach
403415147d
Merge branch 'master' into fix-perform-from-menu-overlay-hiding
2020-11-13 19:11:53 +01:00
smoogipoo
21b015d63a
Remove explicit public
2020-11-14 01:06:38 +09:00
smoogipoo
5cbf6252b7
Merge branch 'hitobject-pooling-in-playfield' into osu-hitobject-pooling-playfield
2020-11-14 01:03:11 +09:00
smoogipoo
c71b237c4f
Merge all pooling support into Playfield
2020-11-14 00:59:08 +09:00
smoogipoo
36f1833f6e
Move hitobject pooling to Playfield
2020-11-14 00:41:18 +09:00
smoogipoo
d347493ba3
Merge branch 'master' into osu-hitobject-pooling
2020-11-13 23:13:09 +09:00
smoogipoo
9792d1fc73
Fix slider tests
2020-11-13 23:08:39 +09:00
Dean Herbert
f093acc9d5
Merge pull request #10823 from smoogipoo/pooling-editor-support
...
Add pooling support to the editor
2020-11-13 19:58:46 +09:00
smoogipoo
d83b479c81
Internalise lifetime extensions and events too
2020-11-13 19:21:45 +09:00
smoogipoo
4a4219fd11
Add region
2020-11-13 19:21:45 +09:00
smoogipoo
92189e35cc
Make playfield KeepAlive methods internal
2020-11-13 19:21:45 +09:00
smoogipoo
832d52a056
Fix hitobject sample tests
2020-11-13 18:19:07 +09:00
Dean Herbert
df7032bc6c
Merge pull request #10803 from smoogipoo/nested-hitobject-pooling
...
Add nested hitobject pooling
2020-11-13 17:34:10 +09:00
smoogipoo
3c91626132
Merge branch 'pooling-editor-support' into osu-editor-pooling
2020-11-13 17:27:00 +09:00
smoogipoo
688a442fb3
Add missing dictionary
2020-11-13 17:26:46 +09:00
smoogipoo
942ecde0e1
Merge branch 'master' into pooling-editor-support
2020-11-13 17:23:35 +09:00
smoogipoo
0219aff7bc
Add timeline visible range adjustment
2020-11-13 17:10:29 +09:00
Dean Herbert
8268b33392
Merge pull request #10822 from peppy/update-framework
...
Update framework
2020-11-13 17:10:07 +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
06fd0d08d1
Merge branch 'master' into nested-hitobject-pooling
2020-11-13 16:53:20 +09:00
Dean Herbert
a9fc7572ed
Update framework
2020-11-13 15:33:27 +09:00
smoogipoo
7085b25898
Merge branch 'hitobject-pooling-base' into osu-hitobject-pooling
2020-11-13 14:57:59 +09:00
smoogipoo
4236dd826d
Improve documentation and make abstract again
2020-11-13 14:57:09 +09:00
smoogipoo
a07d4a7915
Remove unnecessary dictionary for now
2020-11-13 14:42:41 +09:00
smoogipoo
35329aa976
Reduce the number of state updates
2020-11-13 14:33:23 +09:00
Dean Herbert
0985cb3327
Fix perform from menu not hiding overlays if already on target screen
2020-11-13 14:08:08 +09:00
Dean Herbert
a2c81a3a52
Add back setting to toggle "always play first combo break"
2020-11-13 13:42:00 +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
Dean Herbert
38105ed6a2
Merge branch 'master' into hitobject-pooling-base
2020-11-13 11:27:32 +09:00
Dan Balasescu
2840fd0f8f
Merge branch 'master' into hitobject-pooling-base
2020-11-12 23:17:36 +09:00
Bartłomiej Dach
96fbfc33fa
Merge branch 'master' into perform-from-menu-dialog-aware
2020-11-12 15:05:45 +01:00
Dan Balasescu
e804fe5458
Merge pull request #10801 from peppy/fix-legacy-legacy-storyboard-frame-delays
...
Fix storyboard animations of very old beatmaps playing too slow
2020-11-12 19:06:57 +09:00
smoogipoo
0abda7b557
Merge branch 'hitobject-pooling-base' into osu-hitobject-pooling
2020-11-12 18:49:03 +09:00
smoogipoo
261ddd2b4a
Fix samples not being disposed
2020-11-12 18:48:25 +09:00
smoogipoo
8aaa500431
Add lifetime extensions
2020-11-12 18:34:50 +09:00
smoogipoo
243e913e4a
Add hitobject usage events
2020-11-12 18:32:20 +09:00
smoogipoo
fe347c8661
Add playfield support for keeping hitobjects alive
2020-11-12 18:30:32 +09:00
smoogipoo
7548db7ecc
Fix hitobjects sometimes not fading in completely with HD mod
2020-11-12 18:29:22 +09:00
Andrei Zavatski
7177dd5d82
Add counter to most played beatmaps section in user overlay
2020-11-12 18:29:22 +09:00
Dean Herbert
8a2addbf3d
Update framework
2020-11-12 18:29:22 +09:00
Dean Herbert
d9750fc043
Remove duplicate instantiation of externalLinkOpener
2020-11-12 18:29:22 +09:00
smoogipoo
a8c2b798ad
Add support for nested hitobject pooling
2020-11-12 17:43:51 +09:00
smoogipoo
e44a8b3934
Resort as early as possible
2020-11-12 17:07:20 +09:00
Dean Herbert
41a1730927
Merge pull request #10794 from smoogipoo/fix-osu-hd-mod
2020-11-12 17:06:04 +09:00
Dean Herbert
25af091409
Fix storyboard animations of very old beatmaps playing too slow
...
Closes https://github.com/ppy/osu/issues/10772 .
2020-11-12 17:03:43 +09:00
smoogipoo
cf91962865
Fix test failures due to on-the-fly starttime changes
2020-11-12 16:58:40 +09:00
smoogipoo
974390bda7
Make Add() + Remove() virtual
2020-11-12 15:36:02 +09:00
smoogipoo
72a6b75626
Add back removed event
2020-11-12 15:34:51 +09:00
smoogipoo
4e43235955
Fix double bind leading to test failures
2020-11-12 15:33:49 +09:00
smoogipoo
653f5bce67
Reword xmldocs
2020-11-12 15:00:58 +09:00
smoogipoo
16e4e8d032
Fix possible nullref
2020-11-12 14:54:33 +09:00
smoogipoo
1f8d376b85
Replace CreatePool() with non-virtual RegisterPool() overload
2020-11-12 14:17:33 +09:00
smoogipoo
5dbbe11fc6
Remove PoolHitObjects, use return value of CreateDrawableRepresentation() instead
2020-11-12 14:04:16 +09:00
smoogipoo
f652eb9982
Remove GetDrawableRepresentation() override, add null hinting
2020-11-12 13:18:44 +09:00
smoogipoo
d7d77460fb
Small refactorings
2020-11-12 12:55:42 +09:00
Dean Herbert
ad79c2bc62
Avoid multiple enumeration by converting to array at construction time
2020-11-12 10:55:22 +09:00
Andrei Zavatski
f753f138c6
Add counter to most played beatmaps section in user overlay
2020-11-12 03:11:29 +03:00
Dean Herbert
ef5e3d5ab8
Merge pull request #10796 from smoogipoo/fix-incorrect-framestability-value
...
Fix frame stable playback not being set correctly
2020-11-11 19:54:45 +09:00
smoogipoo
a8929b0764
Revert unnecessary change of casting
2020-11-11 19:27:07 +09:00
smoogipoo
7fdaf69903
Add some more xmldocs
2020-11-11 19:12:12 +09:00
smoogipoo
606cfacedf
Fix state update exception in a better way
2020-11-11 19:01:12 +09:00
smoogipoo
7d02018134
Remove some unnecessary implementations for now
2020-11-11 18:54:40 +09:00
smoogipoo
d7bee80d4e
Merge branch 'fix-incorrect-framestability-value' into hitobject-pooling-base
2020-11-11 18:52:51 +09:00
smoogipoo
90499329bd
Fix frame stable playback not being set correctly
2020-11-11 18:50:38 +09:00
Dean Herbert
a08833f3b3
Update framework
2020-11-11 18:03:04 +09:00
Bartłomiej Dach
2b2f0321fd
Merge branch 'master' into fix-osu-hd-mod
2020-11-11 09:45:45 +01:00
smoogipoo
6f7a1dd57d
Merge branch 'master' into hitobject-pooling-base
2020-11-11 17:09:18 +09:00
Dean Herbert
6fa0cc9bda
Merge pull request #10792 from peppy/remove-double-external-link-opener
...
Remove duplicate instantiation of externalLinkOpener
2020-11-11 16:58:35 +09:00
smoogipoo
5d55af5818
Fix hitobjects sometimes not fading in completely with HD mod
2020-11-11 16:35:48 +09:00
Dean Herbert
804450e707
Remove duplicate instantiation of externalLinkOpener
2020-11-11 15:49:45 +09:00
smoogipoo
7df9484458
Merge branch 'master' into add-random-skin-hotkey
2020-11-11 15:48:12 +09:00
Dan Balasescu
09324c4598
Merge pull request #3652 from WebFreak001/shuffle-skin
...
Add "random skin" option to skin setting dropdown
2020-11-11 15:47:00 +09:00
Dan Balasescu
8ad84d6640
Merge branch 'master' into osd-custom-bindings-display
2020-11-11 15:12:31 +09:00
Dan Balasescu
b446f21c68
Merge pull request #10786 from peppy/osd-skin-display
...
Display skin changes via on-screen display overlay
2020-11-11 15:12:19 +09:00
Dean Herbert
c308eb75d9
Move logic for performing actions from specific screen to its own component
2020-11-11 14:45:50 +09:00
Dean Herbert
f78f2fb59e
Merge branch 'osd-custom-bindings-display' into add-random-skin-hotkey
2020-11-11 13:53:49 +09:00
Dean Herbert
324626e097
Move default config tracking calls out of OnScreenDisplay itself
2020-11-11 13:53:09 +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
Dean Herbert
8d38d9cc93
Add hotkey to select random skin
2020-11-11 13:05:03 +09:00
Dean Herbert
df00a4ab9b
Merge branch 'osd-custom-bindings-display' into shuffle-skin
2020-11-11 13:00:32 +09:00
Dean Herbert
3364648fe2
Merge branch 'osd-skin-display' into shuffle-skin
2020-11-11 13:00:31 +09:00
Dean Herbert
6014751e29
Add the ability for the game OSD to display user bindings
...
Adds binding display for mouse button toggle / HUD toggle keys.
- [ ] Depends on #10786 for ease-of-merge
2020-11-11 12:56:10 +09:00
Dean Herbert
9caa56c64f
Display skin changes via on-screen display overlay
2020-11-11 12:19:01 +09:00
Dean Herbert
6674628bc7
Only include user skins in random choices
2020-11-11 12:03:38 +09:00
Dean Herbert
6b548ef5e4
Split out SkinInfo ID constants and fix random logic
2020-11-11 11:54:40 +09:00
Dean Herbert
6593aac3f2
Merge pull request #7762 from EVAST9919/history-graph
2020-11-11 11:35:34 +09:00
Dean Herbert
a5e13e4d2c
Merge branch 'master' into shuffle-skin
2020-11-11 11:34:48 +09:00
Dan Balasescu
451f0a29c6
Merge pull request #10784 from peppy/fix-best-performance-weighting
...
Fix user profile best performance weighting being out of order
2020-11-11 11:21:43 +09:00
Dean Herbert
89c4e3d3b2
Merge branch 'master' into history-graph
2020-11-11 11:01:48 +09:00
Dean Herbert
8706b51b77
Merge pull request #10717 from smoogipoo/dho-apply
2020-11-11 10:54:24 +09:00
Dean Herbert
53c968e137
Fix user profile best performance weighting being out of order
2020-11-11 10:19:59 +09:00
Andrei Zavatski
6c428d8b11
Merge master with conflicts resolved
2020-11-11 01:37:01 +03:00
Bartłomiej Dach
546249b071
Temporarily fix crash on deleting control point groups
2020-11-10 21:32:47 +01:00
smoogipoo
b725c9cce9
Fix possible nullrefs
2020-11-11 00:24:28 +09:00
smoogipoo
e525784cb2
Clear lifetimeEntry after use
2020-11-11 00:24:14 +09:00
smoogipoo
99e5450af3
Cache DrawableRuleset
2020-11-11 00:22:36 +09:00
smoogipoo
66213f2ed0
Add pooling support to DrawableRuleset + Playfield
2020-11-10 23:56:32 +09:00
smoogipoo
31e4d71852
Rewrite HitObjectContainer with pooling support
2020-11-10 22:49:02 +09:00
smoogipoo
5354ef1699
Merge branch 'dho-apply' into hitobject-pooling-base
2020-11-10 22:30:08 +09:00
Bartłomiej Dach
20f9759a2e
Merge branch 'master' into fix-storyboard-sprite-paths
2020-11-10 12:57:10 +01:00
Dean Herbert
e1dcac4d8b
Update framework
2020-11-10 20:29:29 +09:00
Bartłomiej Dach
61093030ee
Remove redundant class name qualifier
2020-11-10 12:20:49 +01:00
Bartłomiej Dach
ce837eaba0
Rename variables
2020-11-10 12:20:26 +01:00
Bartłomiej Dach
dd873dbd85
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 12:17:12 +01:00
smoogipoo
6f3f6dc28b
Add hitobject lifetime support
2020-11-10 20:16:52 +09:00
cadon0
539806e9d6
Rewrite - Add empty drawable whenever sprite not found
2020-11-10 23:52:37 +13:00
cadon0
6446074976
Fix paths for storyboard animation sprites
2020-11-10 23:52:37 +13:00
smoogipoo
45e9f16f6b
Add initial DrawableRuleset interface
2020-11-10 19:27:08 +09:00
smoogipoo
757a4b5c31
Add hitobject lifetime model
2020-11-10 19:26:01 +09:00
smoogipoo
88112801eb
Remove result storage from hitobject
2020-11-10 18:56:16 +09:00
Dan Balasescu
ef1036cef1
Merge pull request #10767 from peppy/fix-editor-crash-on-two-mouse-button-click
...
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 18:41:58 +09:00
Dan Balasescu
d873229120
Merge pull request #10769 from peppy/fix-mod-select-keys-handle-control
...
Stop mod select overlay hotkeys handling input when control is pressed
2020-11-10 18:37:14 +09:00
smoogipoo
f5076fe3b8
Revert unnecessary change
2020-11-10 18:15:11 +09:00
Dan Balasescu
4e3f6f19f4
Merge pull request #10768 from bdach/force-import-standardised
...
Always store standardised score when populating ScoreInfo
2020-11-10 18:12:35 +09:00
Dean Herbert
833c0b223e
Clamp index to valid bounds
2020-11-10 18:08:12 +09:00
Dean Herbert
2e3dc6fc46
Merge branch 'master' into fix-profile-graph-crash
2020-11-10 18:06:51 +09:00
Dean Herbert
28daff1716
Stop mod select overlay hotkeys handling input when control is pressed
...
Closes https://github.com/ppy/osu/issues/10766 in about the best way we
can for now.
2020-11-10 17:57:59 +09:00
Dan Balasescu
601cc477e5
Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click
2020-11-10 17:42:25 +09:00
Dan Balasescu
86026ad98f
Merge pull request #10764 from peppy/fix-editor-quick-delete-via-left-mouse
...
Fix editor quick delete being triggerable from left mouse button
2020-11-10 17:42:12 +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
Bartłomiej Dach
109abc0e29
Always store standardised score when populating ScoreInfo
2020-11-10 08:41:00 +01:00
Dean Herbert
5221a34929
Only handle keys which create characters
2020-11-10 16:32:58 +09:00
Dean Herbert
a2ef3aa21a
Force beatmap listing overlay's textbox back on screen when a key is pressed
...
Not the cleanest solution, but works for now. Will eventually be
replaced after the header is updated to reflect the latest designs
(which keeps it on screen in all cases).
Closes https://github.com/ppy/osu/issues/10703 .
2020-11-10 16:26:30 +09:00
Andrei Zavatski
e464e719ef
Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph
2020-11-10 10:22:57 +03:00
Dean Herbert
6cc0bf17a9
Add explicit lock object and some xmldoc for clarity
2020-11-10 14:31:52 +09:00
Dean Herbert
dc21aebdc7
Merge branch 'master' into fix-bdc-threadsafety
2020-11-10 14:31:51 +09:00
Dean Herbert
85d641c630
Merge pull request #10740 from Game4all/add-multi-statuses
2020-11-10 14:23:26 +09:00
Dean Herbert
4855e43764
Merge pull request #10758 from nbvdkamp/rank-history-json-property-fix
...
Replace rankHistory in JsonProperty with rank_history for consistency
2020-11-10 14:05:25 +09:00
Dean Herbert
582b5454ed
Merge pull request #10759 from Joehuu/disable-watching-yourself
2020-11-10 13:10:54 +09:00
Dean Herbert
4af390a168
Move hierarchy init to load and remove unnecessary field storage
2020-11-10 12:33:07 +09:00
Dean Herbert
de554f9091
Merge pull request #10742 from Morilli/fix-ki-texture-positioning
2020-11-10 12:27:40 +09:00
Joehu
670d6d8719
Make button field readonly
2020-11-09 18:59:54 -08:00
Joehu
c671d97e6f
Disable watch button on the local user
2020-11-09 18:39:35 -08:00
kamp
4303a24a6f
Replace rankHistory in JsonProperty with rank_history
2020-11-10 00:53:24 +01:00
Dean Herbert
37feedae7a
Fix potential crash due to stale index
2020-11-10 07:27:38 +09:00
Dean Herbert
1548c0dc25
Ensure graph hover state is updated after data changes
2020-11-10 07:27:27 +09:00
smoogipoo
0bab5605d1
Merge branch 'master' into dho-apply
2020-11-10 01:30:45 +09:00
smoogipoo
d4d3a6621e
Disable automatic lifetime management
2020-11-10 01:30:25 +09:00
smoogipoo
66ea1572c7
Fix unsafe list manipulation in BeatmapDifficultyCache
2020-11-10 01:10:00 +09:00
smoogipoo
ac47399e6e
Update state after OnApply()
2020-11-10 00:30:23 +09:00
smoogipoo
ec8b726ea8
Re-privatise start time bindable
2020-11-09 21:51:58 +09:00
Lucas A
b8c63e7944
Apply review suggestions.
2020-11-09 13:39:50 +01:00
Dean Herbert
ba137aadc8
Update framework
2020-11-09 20:44:12 +09:00
Dean Herbert
4d6f0a8ea7
Fix API request error handling
2020-11-09 19:42:00 +09:00
Dean Herbert
d99e1ba8dd
Merge branch 'master' into efficient-user-retrieval
2020-11-09 19:41:44 +09:00
Dan Balasescu
33c3b07101
Fix events not being bound correctly
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-11-09 19:06:48 +09: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
Morilli
7b0e387dfc
apply different offset based on whether the marker is newStyle or not
2020-11-09 08:20:19 +01:00
Morilli
490fbd1dd8
Fix ki* textures having an incorrect vertical position
2020-11-09 05:54:48 +01:00
Dean Herbert
cfb42037cf
Refactor request string logic to avoid linq usage
2020-11-09 12:23:29 +09:00
Dean Herbert
690e69bcc6
Reforamt for legibility
2020-11-09 12:22:54 +09:00
Dean Herbert
dc69eefa51
Use HashSet instead of ConcurentBag
2020-11-09 11:54:28 +09:00
Dean Herbert
90ce1bd5f0
Add missing async suffix
2020-11-09 10:40:16 +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
Dean Herbert
42e4df8cc8
Merge branch 'master' into efficient-user-retrieval
2020-11-08 14:35:40 +09:00
Dean Herbert
567cf932f1
Merge pull request #10732 from bdach/editor-exit-stack-overflow
...
Fix crash upon exiting the editor without saving from new beatmap
2020-11-08 12:12:24 +09:00
Bartłomiej Dach
6d4bb4316c
Fix difficulty retrieval for online-sourced beatmaps
2020-11-08 00:12:25 +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
c5b6908e71
Always write [HitObjects] to file
...
I think this is expected. If not, there's an alternative solution.
2020-11-08 00:18:27 +09:00
Dean Herbert
d93cf08570
Merge branch 'master' into dho-apply
2020-11-07 01:18:46 +09:00
smoogipoo
91c627c22d
Revert HOC changes
2020-11-07 00:57:33 +09:00
smoogipoo
b1e039bcec
Prevent overrides from messing with application/freeing
2020-11-07 00:40:26 +09:00
smoogipoo
3a4bd73823
Fix DHOs being freed when not expected
2020-11-07 00:25:26 +09:00
Dean Herbert
f94ac1cbc7
Merge branch 'master' into efficient-user-retrieval
2020-11-07 00:07:29 +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
smoogipoo
7eceda242b
Change derived class to use property
2020-11-06 23:04:28 +09:00
smoogipoo
2d892c7407
Allow Apply() to be called multiple times sequentially
2020-11-06 23:03:29 +09:00
smoogipoo
248d342a2f
Initial Apply()/FreeAfterUse() DHO implementation
2020-11-06 23:02:37 +09:00
smoogipoo
2bef9312d9
Make SkinReloadableDrawable poolable
2020-11-06 22:15:06 +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
4bbd3fe886
Handle null result
2020-11-06 18:37:27 +09:00
Dean Herbert
c3c288145a
Ignore null results for now
2020-11-06 17:55:29 +09:00
Dean Herbert
1ca8b03aa5
Never disable pause button on now playing overlay
2020-11-06 17:26:23 +09:00
Dean Herbert
24be1e183b
Merge branch 'move-cache-logic-to-base-impl' into efficient-user-retrieval
2020-11-06 17:24:36 +09:00
Dean Herbert
c1c3d37720
Remove non-null assert
2020-11-06 17:24:28 +09:00
Dean Herbert
c97c6bbf52
Add and consume user cache class
2020-11-06 17:00:29 +09:00
Dean Herbert
893979b3de
Add exception if attempting to exceed the maximum supported lookup size for one request
2020-11-06 17:00:29 +09:00
Dean Herbert
2457083d8b
Add padding to currently playing view
2020-11-06 17:00:29 +09:00
Dean Herbert
db039da668
Add and consume multi-lookup API endpoint
2020-11-06 17:00:29 +09:00
Dean Herbert
aa252d562a
Rename top user request to make way for new type
2020-11-06 17:00:29 +09:00
Dean Herbert
f51cb0dd14
Add ruleset fallback logic into cache lookup class
2020-11-06 16:58:53 +09:00
Dean Herbert
d3a303e251
Use CheckExists function
2020-11-06 16:57:09 +09:00
Dean Herbert
9bb32f0914
Merge branch 'master' into move-cache-logic-to-base-impl
2020-11-06 16:56:35 +09:00
Dan Balasescu
44c6457c85
Merge branch 'master' into add-spinner-spin
2020-11-06 15:40:40 +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
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
Dean Herbert
326fd03525
Fix loop not exiting after first valid frame
2020-10-30 15:25:53 +09:00
Dan Balasescu
b14291a312
Merge branch 'master' into tracked-hud-visibility-settings
2020-10-30 14:58:45 +09:00
Dan Balasescu
8be16bd4ed
Merge pull request #10370 from peppy/fix-test-beatmap-virtual-clock
...
Ensure virtual track time is long enough for test beatmaps
2020-10-30 14:23:06 +09:00
Dan Balasescu
45b8af5391
Merge pull request #10614 from peppy/results-screen-animate-once
...
Only play results panel animation once (and only for the local user)
2020-10-30 14:21:05 +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
c72017a7db
Remove "hide during breaks" option
...
Probably wouldn't be used anyway.
2020-10-30 13:49:45 +09:00
Dean Herbert
f58f8e0f93
Update resources
2020-10-30 13:46:54 +09:00
Dean Herbert
9bb86ccb83
Change shift-tab to cycle available HUD visibility modes
2020-10-30 13:09:22 +09:00
Dean Herbert
18f92818da
Show current HUD visibility mode as a tracked setting
2020-10-30 13:09:13 +09:00
Dean Herbert
46d89d55f4
Add note about ScheduleAfterChildren requirement
2020-10-30 12:47:04 +09:00
Dean Herbert
8e6c803900
Avoid running full updateClock loop when waiting on frames
2020-10-30 12:39:11 +09:00
Dean Herbert
8dbaca341e
Merge branch 'sample-lookup-improvements' into results-screen-applause
2020-10-30 12:28:48 +09:00
Dean Herbert
b906736b85
Remove redundant initialisation
2020-10-30 12:28:40 +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
d319b27b3d
Run sample lookup logic through getFallbackNames
2020-10-30 11:59:41 +09:00
Dean Herbert
0b28cca7e6
Don't force Gameplay prefix on all skin sample lookups
2020-10-30 11:59:40 +09:00
Dean Herbert
c9a85587fb
Allow SampleInfo to specify fallback sample lookup names
2020-10-30 11:59:29 +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
d9846fad37
Remove fallback texture parameter
...
When there isn't a seasonal event, we don't want to fall back to the basic background here, but rather to the user selected background source.
2020-10-29 18:03:36 +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
Max Hübner
907e1921c7
Make SeasonalBackgroundLoader read from SessionStatics
2020-10-29 17:31:42 +01:00
Max Hübner
76c0a790b4
Add separate Seasonal Backgrounds setting (Always, Sometimes, Never)
2020-10-29 17:28:04 +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
Max Hübner
7d523fee28
Revert "Set BackgroundSource.Seasonal as default setting"
...
This reverts commit cdb2d23578
2020-10-29 14:31:07 +01:00
Max Hübner
0c540537c9
Revert "Add BackgroundSource.Seasonal"
...
This reverts commit 2871001cc2
2020-10-29 14:30:50 +01:00
Dean Herbert
1c353b4745
Update framework
2020-10-29 20:38:28 +09:00
Dean Herbert
17ea06f793
Merge branch 'results-screen-animate-once' into results-screen-applause
2020-10-29 20:23:25 +09:00
Dean Herbert
7be4dfabd8
Revert "Update namespace references"
...
This reverts commit d69d78ab5d
2020-10-29 20:23:15 +09: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
d69d78ab5d
Update namespace references
2020-10-29 18:45:18 +09:00
Dean Herbert
f1b8a8f7f5
Remove unused using
2020-10-29 18:16:04 +09:00
Dean Herbert
335d150a13
Fix aim time being mutated inside update loop
2020-10-29 18:11:50 +09:00
Dean Herbert
4dec46b33e
Attempt to fix in a less destructive way for now
2020-10-29 17:52:58 +09:00
Dean Herbert
7bef695072
Merge branch 'master' into fix-test-beatmap-virtual-clock
2020-10-29 17:51:15 +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
c863341ca1
Don't force Gameplay prefix on all skin sample lookups
2020-10-29 16:32:20 +09:00
Dean Herbert
b49a579411
Allow SampleInfo to specify fallback sample lookup names
2020-10-29 16:32:03 +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
Dean Herbert
6e630e8c88
Merge branch 'spectator-replay-watcher' into spectator-listing
2020-10-29 15:33:43 +09:00
Dean Herbert
2671d371da
Move clock retrieval to new correct location
2020-10-29 15:28:39 +09:00
Dean Herbert
3ea27e23e8
Update namespace references
2020-10-29 15:20:10 +09:00
Dean Herbert
3751c357a3
Update framework
2020-10-29 15:19:05 +09:00
Dean Herbert
0818835b16
Merge branch 'spectator-replay-watcher' into spectator-listing
2020-10-29 15:13:21 +09:00
Dean Herbert
db2b00068f
Avoid sourcing parent clock when in a paused state
2020-10-29 14:48:56 +09:00
Dean Herbert
d91456dc29
Move initial validity check out of loop for clarity
2020-10-29 14:25:47 +09:00
Dean Herbert
2e5a8b2287
Fix xmldoc to read better in new context
2020-10-29 13:16:31 +09:00
Dan Balasescu
a022b869eb
Merge branch 'master' into frame-stability-clean-up
2020-10-29 13:02:17 +09:00
Dan Balasescu
4a264bc173
Merge branch 'master' into beatmap-listing-search-options
2020-10-29 12:04:40 +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
1313ab89e7
Add xmldoc to multiple selection row
2020-10-28 23:37:21 +01:00
Bartłomiej Dach
016e920aa9
Move filter tab item hierarchy construction to BDL
2020-10-28 23:14:52 +01:00
Bartłomiej Dach
a8cefb0d4c
Rename method
2020-10-28 23:12:28 +01:00
Bartłomiej Dach
f5aedc96c4
Rework multiple selection filter
2020-10-28 23:07:54 +01:00
Bartłomiej Dach
e77049eae3
Use discard-like lambda parameter names
2020-10-28 22:58:51 +01:00
Bartłomiej Dach
fa53549ed2
Mark request fields as possibly-null
2020-10-28 22:57:03 +01: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
Andrei Zavatski
5c2c5f2000
Use existing ScoreRank for rank filter
2020-10-28 23:35:08 +03:00
Andrei Zavatski
4f6081c7f3
Use BindableList<T>
2020-10-28 19:44:13 +03: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
Dean Herbert
93fd913876
Add setting to allow automatically downloading during a spectating session
2020-10-28 19:43:06 +09:00
Dean Herbert
9807089834
Fix screen exit potentially occuring during transition
2020-10-28 19:43:06 +09:00
Dean Herbert
4df8119852
Add missing schedule
2020-10-28 19:43:06 +09:00
Dean Herbert
93e3e1a4db
Don't inherit ReplayPlayer to make results screen work correctly
2020-10-28 19:02:38 +09:00
Dean Herbert
344ff8f4bc
"Improve" visuals of spectator screen
2020-10-28 19:02:38 +09:00
Dean Herbert
2d73dfbe39
Add more safety around beatmap panel and button display logic
2020-10-28 19:02:38 +09:00
Dean Herbert
c97feb09bf
Allow continuing to automatically spectate user from results screen
2020-10-28 19:02:38 +09:00
Dean Herbert
16b0a7b33e
Add button flow to allow resuming watching after exiting manually
2020-10-28 19:02:38 +09:00
Dean Herbert
84d854e231
Avoid having the user profile show when clicking a spectator panel
2020-10-28 19:02:38 +09:00
Dean Herbert
32becb6882
Add simple listing of currently playing users
2020-10-28 19:02:38 +09:00
Dean Herbert
ce9dd0c920
Fix enum descriptions not being displayed in OverlayHeaderTabControl
2020-10-28 17:44:15 +09:00
Dean Herbert
6169349f7c
Fix switching to new beatmap not working correctly
2020-10-28 17:44:11 +09:00
Dean Herbert
730cc645fb
Avoid reconstructing ruleset for each frame bundle
2020-10-28 16:33:52 +09:00
Dean Herbert
48b0357e7d
Fix "finished playing" events handled for potentially incorrect user
2020-10-28 16:11:14 +09:00
Dean Herbert
6eddd76bdc
Simplify FramedReplayInputHandler's SetFrame implementation
2020-10-28 16:03:23 +09:00
Dean Herbert
09da75b143
Merge branch 'frame-stability-clean-up' into spectator-replay-watcher
2020-10-28 15:34:46 +09:00
Dean Herbert
2b1e79a4e8
Simplify state changes further
2020-10-28 15:32:20 +09:00
Dean Herbert
c9515653b3
Restore previous directionality logic to avoid logic differences
2020-10-28 15:31:57 +09:00
Dean Herbert
77d807d0f5
Merge branch 'frame-stability-clean-up' into spectator-replay-watcher
2020-10-28 15:26:02 +09:00
Dean Herbert
59e9c2639a
Remove try-finally
2020-10-28 15:16:56 +09:00
Dean Herbert
a06516c900
Extract out frame stability state into enum for (hopefully) better clarity
2020-10-28 15:15:15 +09:00
Dean Herbert
8c9bda2ded
Split out replay update method
2020-10-28 15:14:06 +09:00
Dean Herbert
9b9a41596f
Split out frame stability calculation to own method
2020-10-28 15:14:06 +09:00
Dean Herbert
3e5322541d
Make direction setting more clear
2020-10-28 14:35:42 +09:00
Dean Herbert
351acce698
Merge branch 'master' into fix-editor-bindable-crash
2020-10-28 13:34:54 +09:00
Dean Herbert
01b576c861
Fix editor crash on exit when forcing exit twice in a row
2020-10-28 13:32:39 +09:00
Andrei Zavatski
914bd53788
Add missing blank line
2020-10-28 02:39:51 +03:00
Andrei Zavatski
6fd3686c4d
Use IReadOnlyCollection instead of List in SearchBeatmapSetsRequest
2020-10-28 02:36:35 +03:00
Andrei Zavatski
03c5057a92
Simplify BeatmapSearchMultipleSelectionFilterRow
2020-10-28 02:28:31 +03:00
Andrei Zavatski
fd11346a28
Update button colours
2020-10-28 01:48:24 +03:00
Andrei Zavatski
b4ec3b9fef
Simplify MultipleSelectionFilterTabItem state changes
2020-10-28 01:41:46 +03:00
Dean Herbert
0a7f3dc19b
Avoid null reference on finalization
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-10-28 07:29:07 +09:00
Andrei Zavatski
c4efceceb2
Use char instead of sting for request parameter creation
2020-10-27 23:57:11 +03:00
Andrei Zavatski
008d1d697c
Implement filtering by rank achieved
2020-10-27 23:14:48 +03:00
Andrei Zavatski
1710b396e7
Implement BeatmapSearchMultipleSelectionFilterRow
2020-10-27 22:27:29 +03:00
Andrei Zavatski
1b40b56d41
Add ability to search by play criteria
2020-10-27 21:30:53 +03:00
Andrei Zavatski
26a60d898c
Implement BeatmapSearchExtraFilterRow
2020-10-27 21:22:20 +03:00
Andrei Zavatski
742a96484b
Add ability to set extra parameters to SearchBeatmapSetsRequest
2020-10-27 20:13:18 +03:00
Leon Gebler
0ddf840a63
Merge branch 'master' into fix-timeline-drag-select-weirdness
2020-10-27 15:31:55 +01:00
Leon Gebler
983a2774e8
Code Formatting
2020-10-27 15:09:10 +01:00
Leon Gebler
064c50c3ac
Expose currentZoom to fix selection box wiggle
2020-10-27 14:38:35 +01:00
Dean Herbert
d5e0fa322b
Fix a couple of inspections
2020-10-27 22:30:45 +09:00
Lucas A
a96c067bea
Remove uncessary async-await state machine level.
2020-10-27 13:45:21 +01:00
Dan Balasescu
26a7545534
Merge branch 'master' into fix-editor-samples-not-pausing-screen-swap
2020-10-27 21:29:16 +09:00
Dean Herbert
2cacdaa11b
Add basic beatmap download and play flow
2020-10-27 19:28:34 +09:00
Dean Herbert
42b3aa3359
Fix spectating when starting from a point that isn't at the beginning of the beatmap
2020-10-27 18:58:37 +09:00
Dean Herbert
b3d793a505
Fix gameplay proceeding when no frames have been received yet
2020-10-27 18:58:37 +09:00
Dean Herbert
851d45d2eb
Add sane pausing logic
2020-10-27 18:58:37 +09:00
Dean Herbert
9e6b0a42ec
Allow FrameStabilityContainer to handle waiting-for-data state better (and pause outwards)
2020-10-27 18:58:37 +09:00
Dean Herbert
3ec3321a3d
Add missing space
2020-10-27 18:58:37 +09:00
Dean Herbert
b737a8bf6e
Add field to Replay denoting whether the full replay have been received or not
2020-10-27 18:58:37 +09:00
Dean Herbert
c1e7cd6e47
Stop replay playback when frames are starved
2020-10-27 18:58:37 +09:00
Dean Herbert
9bac8f3792
Add null check on replay as safety measure
2020-10-27 18:58:37 +09:00
Dean Herbert
400542bc0b
Ensure frames arrive
2020-10-27 18:58:37 +09:00
Dean Herbert
ac4671c594
Add basic implementation of spectator screen
2020-10-27 18:58:37 +09:00
Dean Herbert
154ccf1b49
Expose events from streaming client
2020-10-27 18:58:37 +09:00
Dean Herbert
5fd97bd043
Add basic spectator screen
2020-10-27 18:58:37 +09:00
Dean Herbert
df5348cd93
Merge pull request #10601 from peppy/move-sample-pause-logic
2020-10-27 17:49:32 +09:00
Dean Herbert
b8beac27ce
Use previous logic for catching-up mode
2020-10-27 17:14:41 +09:00
Dean Herbert
e0ad005cc1
Move editor sample disabling logic to editor class (and support screen switching)
2020-10-27 14:33:44 +09:00
Dean Herbert
09087faf3b
Fix non-matching filename
2020-10-27 14:23:24 +09:00
Dean Herbert
9cfb81589e
Use bindable flow instead
2020-10-27 14:10:12 +09:00
Dean Herbert
6853da459d
Move sample pausing logic out of FrameStabilityContainer
2020-10-27 13:54:33 +09:00
Dean Herbert
3c2e2f29bc
Remove unused using statement
2020-10-27 13:17:44 +09:00
Dean Herbert
27c1a4c4d3
Move right-click deletion logic to be handled at a SelectionBlueprint level
2020-10-27 12:53:54 +09:00
Dean Herbert
e1f578c590
Change editor timing screen seek behaviour to only occur on clicking table rows
...
Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).
Closes #10590 .
2020-10-27 12:28:12 +09:00
Dean Herbert
266596d404
Merge branch 'master' into right-click-circle-delete
2020-10-27 12:02:29 +09:00
Dean Herbert
68719bb23d
Rename other variables to match
2020-10-27 10:59:24 +09:00
Bartłomiej Dach
7392876b5f
Fix mania crashing due to spectator client handling frames with unconverted beatmap
2020-10-27 00:35:25 +01:00
Bartłomiej Dach
3f8c4c57d0
Fix code style issues & restructure
2020-10-26 22:16:28 +01:00
Charlie
255bb9d100
fixed issue with returns
2020-10-26 14:52:59 -05:00
