cdwcgt
a91da2284d
safe way to pass bindable
2022-12-30 22:58:46 +09:00
cdwcgt
3c32a50c12
add new accuracy counter display
2022-12-30 21:19:46 +09:00
Bartłomiej Dach
3c0b8af8f1
Allow unsubscribing from solo statistics updates
...
This is more of a safety item. To avoid potential duplicate key in
dictionary errors (and also avoid being slightly memory-leaky), allow
`SoloStatisticsWatcher` consumers to dispose of the subscriptions they
take out.
2022-12-28 08:07:48 +01:00
Bartłomiej Dach
04f9a354c3
Convert SoloResultsScreen to NRT
2022-12-28 07:54:36 +01:00
Bartłomiej Dach
e90619244d
Fix incorrect accuracy display on overall ranking view
2022-12-27 19:51:51 +01:00
Dean Herbert
df6f2ad0a1
Merge pull request #21804 from bdach/hide-global-rankings-when-presenting-scores
...
Only show global rankings on solo results screen when progressing from gameplay
2022-12-27 16:39:26 +08:00
integer
a0690e7ffb
replay menus remembers expanded state
...
no messing with readonly fields
2022-12-27 00:13:46 +00:00
Bartłomiej Dach
01cf96e240
Only show global rankings on results screen when progressing from gameplay
2022-12-26 23:35:45 +01:00
Berkan Diler
c7ca4bbba5
Use generic Enum methods
2022-12-26 20:36:39 +01:00
Joseph Madamba
0dba25e0ab
Refactor to just exit sub screens until lounge sub screen
...
Co-Authored-By: Salman Ahmed <frenzibyte@gmail.com>
2022-12-25 21:56:22 -08:00
Joseph Madamba
5232588a1f
Use PerformFromScreen to exit sub screens instead
2022-12-24 20:04:45 -08:00
Joseph Madamba
00ed5d6f92
Merge remote-tracking branch 'upstream/master' into fix-op-non-current-onexiting
2022-12-24 14:01:11 -08:00
Bartłomiej Dach
36a6f3685e
Don't show global rankings display when not logged in
2022-12-24 14:35:11 +01:00
Bartłomiej Dach
da519acb20
Add overall ranking display to solo results
2022-12-24 14:35:04 +01:00
Bartłomiej Dach
3abdf557ea
Add protected method for customising statistics panel rows
2022-12-24 14:35:00 +01:00
Bartłomiej Dach
600ada46be
Add protected method for customising statistics panel
2022-12-24 14:34:54 +01:00
Bartłomiej Dach
cf0b3ec879
Merge branch 'master' into score-stats-display
2022-12-24 14:32:08 +01:00
Bartłomiej Dach
83a50816b6
Remove unused constructor param
2022-12-24 10:44:38 +01:00
Bartłomiej Dach
4e5109a649
Use plain bindable flow instead of binding to watcher directly
2022-12-24 10:27:28 +01:00
Bartłomiej Dach
c7f248e13c
Implement overall ranking display for solo results screen
2022-12-24 00:30:38 +01:00
Joseph Madamba
494886ef92
Rename Text to Metadata
2022-12-23 11:11:15 -08:00
ansel
f25439e359
Move track change subscription to LoadComplete
2022-12-23 01:54:49 +03:00
Bartłomiej Dach
676d4a0d6d
Merge branch 'master' into fix-waveform-zoom-reload
2022-12-22 23:48:50 +01:00
Salman Ahmed
0cb9b79834
Fix ZoomableScrollContainer potentially not updating content width on setup
2022-12-23 00:56:38 +03:00
Salman Ahmed
30de9ba795
Dispose previous waveform on track reload
2022-12-23 00:35:59 +03:00
Berkan Diler
08d2fbeb8e
Use new ArgumentNullException.ThrowIfNull throw-helper API
2022-12-22 21:27:59 +01:00
ansel
20370bd5ae
Invalidate waveform on track load
2022-12-22 20:49:09 +03:00
ansel
d0645ce151
Rewrite waveform invalidation
2022-12-22 15:59:51 +03:00
ansel
f2e8776529
Bind to clock instead of music controller
2022-12-22 15:35:53 +03:00
ansel
a18ece8610
Listen for track reload in timing screen
2022-12-22 01:24:23 +03:00
ansel
7089bb6c23
Listen for track reload in timeline
2022-12-22 01:23:59 +03:00
ansel
66a02374da
Clear cached waveform on track change in editor
2022-12-22 01:23:24 +03:00
Bartłomiej Dach
6948035a3c
Ensure score submission attempt completion before notifying spectator server when exiting play early
...
When a `SubmittingPlayer` gameplay session ends with the successful
completion of a beatmap, `PrepareScoreForResultsAsync()` ensures that
the score submission request is sent to and responded to by osu-web
before calling `ISpectatorClient.EndPlaying()`.
While previously this was mostly an implementation detail, this becomes
important when considering that more and more server-side flows (replay
upload, notifying about score processing completion) hook into
`EndPlaying()`, and assume that by the point that message arrives at
osu-spectator-server, the score has already been submitted and has been
assigned a score ID that corresponds to the score submission token.
As it turns out, in the early-exit path (when the user exits the play
midway through, retries, or just fails), the same ordering guarantees
were not provided. The score's submission ran concurrently to the
spectator client `EndPlaying()` call, therefore creating a network
race. osu-server-spectator components that implciitly relied on the
ordering provided by the happy path, could therefore fail to unmap the
score submission token to a score ID.
Note that as written, the osu-server-spectator replay upload flow is
not really affected by this, as it self-corrects by essentially polling
the database and trying to unmap the score submission token to a score
ID for up to 30 seconds. However, this change would have the benefit of
reducing the polls required in such cases to just one DB retrieval.
2022-12-21 22:23:26 +01:00
Joseph Madamba
1d39e8d0ce
Refactor MetadataSection to use generics and inheritance
2022-12-21 10:18:47 -08:00
Dean Herbert
4a7d7c6ed9
Use MaxBy in all locations that can and update inspection level to match dotnet-build
2022-12-19 16:47:10 +09:00
Dean Herbert
b64a5cbda6
Merge branch 'master' into guard-url-protocols
2022-12-19 15:46:45 +09:00
Bartłomiej Dach
fea0895f16
Call spectator EndPlaying() immediately after score submission
...
As it turns out, in current `master`, if a gameplay session ends
normally (i.e. by the player completing the beatmap in full), then
the spectator server `EndPlaying()` method will not be called until
`SubmittingPlayer.OnExiting()`, which in practice turns out to be
the moment where the user exits from the post-gameplay results screen
back to song select.
There is seemingly no reasonable cause for not calling this earlier. In
fact the solo spectator flow looks more broken without this call than
with, because without it the spectator view just hangs until the
spectated player exits gameplay, and *only then* shows results, rather
than do it upon normal gameplay completion.
2022-12-17 21:35:43 +01:00
mk56-spn
f3873b73e3
Clean up syntax for readability
2022-12-16 20:56:34 +01:00
Dean Herbert
ba54551313
Merge branch 'master' into guard-url-protocols
2022-12-16 18:23:16 +09:00
Dean Herbert
27c497145f
Fix the MOTHERLOAD of undetected issues that are now visible thanks to net6.0
2022-12-16 18:16:26 +09:00
Jamie Taylor
d5b2c7dfe9
Clamp SFX panning on results screen
2022-12-16 17:19:07 +09:00
Dan Balasescu
cbee72897a
Merge pull request #21654 from Susko3/use-localisable-strings-for-dates-and-times
...
Use `LocalisableString`s for date and time formats
2022-12-16 16:17:14 +09:00
Dean Herbert
232f590ba3
Merge pull request #21628 from peppy/go-hard-file-writes
...
Use hard links on windows when importing beatmaps from a legacy osu! install
2022-12-16 14:52:57 +09:00
cdwcgt
a4d28aff6d
fix typo
2022-12-16 10:48:56 +09:00
cdwcgt
79e27c2d9d
PreviewTimePart will not show if preview time is -1
2022-12-16 10:44:07 +09:00
cdwcgt
f0246df1a9
only get;
2022-12-16 09:58:58 +09:00
Susko3
0f34d908c7
Use LocalisableStrings for date and time formats
2022-12-16 00:05:47 +01:00
cdwcgt
c164744064
Add ability to set preview time
2022-12-16 01:03:30 +09:00
mk56-spn
0c177aa7de
Improve tests, simplify "updateDisplay" method
2022-12-15 16:12:34 +01:00
mk56-spn
9a235b3213
remove rolling duration, fix issue with loading
2022-12-15 15:21:03 +01:00
Dean Herbert
50dc76d579
Merge pull request #21618 from smoogipoo/multi-spec-only-local-results
...
Only show local results in multi-spectator results screen
2022-12-14 14:00:02 +09:00
Dean Herbert
b8904fe747
Move ImportParameters to better home
2022-12-13 21:41:26 +09:00
Dean Herbert
cb16d62700
Hook up ImportParameter flow with IModelImporter caller methods
2022-12-13 21:29:32 +09:00
mk56-spn
edb46e422c
Fix "using" name in HUD overlay
2022-12-12 15:15:30 +01:00
mk56-spn
99d83315c1
change settings order
2022-12-12 15:10:45 +01:00
mk56-spn
8efe7528e3
change ruleset source to avoid issues with converted beatmaps
2022-12-12 15:10:10 +01:00
mk56-spn
4d592184ca
temp cmt
2022-12-12 11:53:07 +01:00
Dan Balasescu
7b48c91fe2
Only show local results in multi-spectator results screen
2022-12-12 18:56:43 +09:00
mk56-spn
58bf081096
Fix judgement counter not loading after first attempt in gameplay, Fix typo in Display
2022-12-12 10:52:55 +01:00
Dan Balasescu
caa0b7c290
Move score token to BeginPlaying
2022-12-12 13:59:27 +09:00
mk56-spn
f0c780f1f6
Fix tally header
2022-12-12 00:48:35 +01:00
mk56-spn
a107fca5d0
Hide "Full" option from counter flow directions
2022-12-12 00:33:28 +01:00
mk56-spn
161894da3b
Add more test checks and fix deserialisation test
2022-12-11 23:58:10 +01:00
mk56-spn
4c17b27273
Add Display, Counter, Tests
2022-12-11 23:47:17 +01:00
mk56-spn
f798951f09
Create Judgement Info struct
2022-12-11 22:09:14 +01:00
mk56-spn
ffbe68bd26
Add judgementTally to HUD overlay
2022-12-11 22:08:48 +01:00
Dan Balasescu
4a65f5c864
Add score token to spectator state
2022-12-09 19:09:51 +09:00
Loreos7
0aeee8d6ab
fix typo in today's tip
2022-12-07 17:47:37 +03:00
Dean Herbert
eea7984ba9
Remove triangle effect from latency certifier buttons
2022-12-07 14:53:56 +09:00
mk56-spn
fc630165fd
Adjust formatting of BPM text
2022-12-06 15:08:21 +01:00
Dan Balasescu
9ddc2f4804
Merge pull request #21523 from Feodor0090/rewind-click-fix
...
Perform rewind with right click only if cursor didn't leave the button
2022-12-06 13:38:20 +09:00
ansel
b66409bd37
Perform rewind with right click only if cursor didn't leave the button
2022-12-05 23:38:45 +03:00
mk56-spn
f69c084969
Add roll duration
2022-12-05 17:08:00 +01:00
mk56-spn
b6a6db1160
Add dynamic BPM counter to SkinEditor
2022-12-05 12:29:23 +01:00
Andrei Zavatski
41f7dad8e9
Delete SmoothCircularProgress.cs
2022-12-03 16:40:41 +03:00
Andrei Zavatski
97b6d88f00
Remove SmoothCircularProgress usage in AccuracyCircle
2022-12-03 16:39:44 +03:00
Dean Herbert
5a69656764
Merge pull request #21496 from peppy/fix-zero-length-spinners
...
Fix being able to place zero-length spinners
2022-12-02 19:25:00 +09:00
Dan Balasescu
850931120d
Merge pull request #21479 from peppy/fix-wrong-last-hit-object-time
...
Fix some components not accounting for final hold notes in osu!mania beatmaps
2022-12-02 18:12:00 +09:00
Dean Herbert
d1296a22ce
Update timeline blueprint's end time logic to better match new blueprint implementation
2022-12-02 17:57:15 +09:00
Dan Balasescu
a39bd634c4
Merge pull request #21405 from LumpBloom7/Editor-DrawableRuleset-Dependencies
...
Provide DrawableRulesetDependencies from HitObjectComposer
2022-12-02 17:31:31 +09:00
Dan Balasescu
d684aa75b8
Merge pull request #21477 from peppy/fix-mania-timeline-blueprint-colour
...
Fix osu!mania editor timeline showing bright-white blueprints
2022-12-02 16:55:29 +09:00
Dean Herbert
a2db0afe19
Avoid querying GetLastObjectTime twice in editor seek flow
2022-12-02 16:07:24 +09:00
Dean Herbert
8cf89fcb81
Use Highlight1 instead of dull grey
2022-12-02 15:30:47 +09:00
Dean Herbert
896f2d8f74
Fix multiple instances of last hitobject time being calculated incorrectly
2022-12-01 18:04:06 +09:00
Dean Herbert
f34a79b1a9
Set a better default colour for timeline blueprints when no colour information is available
2022-12-01 17:03:53 +09:00
Dean Herbert
bbf023cf68
Fix incorrect culture used when parsing timeline popup textbox content
2022-12-01 16:12:29 +09:00
Derrick Timmermans
5c8fce1c08
Remove extra blank line
2022-11-30 13:05:14 +01:00
Derrick Timmermans
6a61e70766
Expose Ruleset from HitObjectComposer instead
2022-11-30 12:17:58 +01:00
Dean Herbert
4215f4f5d7
Merge branch 'master' into Editor-DrawableRuleset-Dependencies
2022-11-30 17:42:46 +09:00
Dean Herbert
2a3b24d058
Avoid need for implicit null casting
2022-11-30 14:21:04 +09:00
Dean Herbert
0659c84341
Rename method to be more in line with project naming
2022-11-30 14:17:49 +09:00
Dean Herbert
63ba40ff39
Merge branch 'master' into control-point-scroll-into-view
2022-11-30 14:12:19 +09:00
Jai Sharma
7dbf379351
Don't use verbatim string literals
2022-11-29 18:22:07 +00:00
Derrick Timmermans
70c320b2e8
Provide ruleset dependencies only to Compose Placement Blueprints
2022-11-27 21:43:33 +01:00
mk56-spn
0aba119056
Merge remote-tracking branch 'origin/RangeSlider_implementation' into RangeSlider_implementation
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
# osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
2022-11-27 10:40:29 +01:00
Jai Sharma
218c04c174
Code quality
2022-11-27 03:23:08 +00:00
Jai Sharma
6000e14668
Correctly select issue row
2022-11-27 03:08:54 +00:00
Jai Sharma
3c56b9c93a
Add OnRowSelected event to EditorTable
2022-11-27 02:47:54 +00:00
Jai Sharma
792334a190
Move Control Group timing data into it's own component
2022-11-27 02:47:02 +00:00
Jai Sharma
b6d7bec240
Remove #nullable disabled from EditorTable and it's derived classes
2022-11-27 02:45:56 +00:00
Jai Sharma
1a914d0df7
Remove #nullable disable from TimingScreen
2022-11-27 02:43:22 +00:00
Bartłomiej Dach
894ef15e79
Merge branch 'master' into update-framework
2022-11-26 16:19:36 +01:00
Dan Balasescu
7bc8908ca9
Partial everything
2022-11-27 00:00:27 +09:00
mk56-spn
92ed2ed4ef
Refactor star "DifficultyRangeFilterControl" into generic range slider class
2022-11-26 12:19:08 +01:00
Bartłomiej Dach
73176a1315
Merge branch 'master' into triangle-button-v2
2022-11-25 18:35:59 +01:00
Bartłomiej Dach
bbbc1d0428
Darken colour of playlists create button
...
To match d0c4637683
2022-11-25 18:23:28 +01:00
Dean Herbert
d0c4637683
Lighten colour of multiplayer create game button
2022-11-25 20:18:21 +09:00
Bartłomiej Dach
fca3e7e39f
Merge branch 'master' into editor-seek-control-points
2022-11-24 21:53:47 +01:00
Dean Herbert
2b2beadd06
Merge branch 'master' into update-framework
2022-11-25 01:00:08 +09:00
Dean Herbert
6ad432b311
Use RoundedButton in more places
2022-11-24 16:33:01 +09:00
Dean Herbert
53b03df93d
Combine TriangleButton and RoundedButton classes
2022-11-24 16:26:57 +09:00
Dean Herbert
bea2acc60e
Remove local specifications of triangle colouring
2022-11-24 16:18:15 +09:00
Dean Herbert
37f725bfa2
Reverse directionality of up/down traversal keys to match scroll
2022-11-24 13:55:58 +09:00
Dean Herbert
b381b4fd2d
Merge branch 'master' into update-framework
2022-11-24 01:27:58 +09:00
Bartłomiej Dach
30f9cc46a7
Protect offset and bpm adjustments from null selection too
2022-11-23 17:25:43 +01:00
Dean Herbert
9b9b8a5977
Add ability to seek between control points in editor using down/up arrows
...
Matches stable. Addresses #21376 .
2022-11-23 15:59:32 +09:00
Dean Herbert
d146f86511
Fix crash when hitting 'T' to tap timing while no timing point is selected
2022-11-23 15:39:56 +09:00
Dean Herbert
de163b2bb5
Change song select to only allow volume adjusting if alt is held while scrolling
2022-11-22 19:48:55 +09:00
Dean Herbert
4a79141824
Merge pull request #21338 from RATCM/fix-leaderboard-filter
...
Match leaderboard filter behaviour to web
2022-11-21 14:01:55 +09:00
Dean Herbert
dfa92b3de9
Merge pull request #21326 from bdach/fix-phantom-beatmap-sets
...
Fix phantom beatmap sets appearing on carousel after delete/update
2022-11-21 13:25:14 +09:00
RATCM
f5fbb7c8de
Changed comments
2022-11-20 19:27:40 +01:00
RATCM
d20a357c0e
Fixed ordering bug
2022-11-20 19:24:51 +01:00
RATCM
9040dfbd4e
Match leaderboard filter behaviour to web
2022-11-20 17:39:46 +01:00
Bartłomiej Dach
1269afd0c5
Merge pull request #21307 from frenzibyte/disable-scroll-speed-on-osu
...
Hide scroll speed control from effects section on rulesets which don't support it
2022-11-20 16:17:55 +01:00
Bartłomiej Dach
7b274083d3
Fix phantom beatmap sets appearing on carousel after delete/update
...
Regressed in c40c70509e
2022-11-20 10:08:34 +01:00
Salman Ahmed
4b0ba86bd0
Identify scrolling rulesets using temporary DrawableRuleset instances
2022-11-20 04:12:52 +03:00
Bartłomiej Dach
c05c1625f2
Merge branch 'master' into editor-test-play-dont-retain-test-time
2022-11-19 12:09:04 +01:00
Salman Ahmed
60c424837b
Merge branch 'master' into disable-scroll-speed-on-osu
2022-11-19 12:13:45 +03:00
Salman Ahmed
2e3af97892
Remove unused using
2022-11-19 12:13:36 +03:00
Salman Ahmed
290369db47
Hide scroll speed slider on rulesets which don't support it
2022-11-19 06:42:27 +03:00
Salman Ahmed
016de2f5a0
Fix editor not always playing hitsounds with clock offsets applied
2022-11-19 05:15:22 +03:00
Dawid Sośnia
9ad484a0f4
Merge branch 'ppy:master' into gameplay-leaderboard-fix
2022-11-18 12:11:22 +01:00
Dean Herbert
06ce8130c2
Apply changes in line with framework NRT updates
2022-11-18 18:13:15 +09:00
Dan Balasescu
d8e99d811d
Merge pull request #21293 from frenzibyte/fix-timeline-extent-scrolling
...
Fix timeline potentially scrolling at extents while not dragging
2022-11-18 16:19:30 +09:00
Dean Herbert
d59befc9d3
Fix initial visual state of positions before sort runs
2022-11-18 16:08:27 +09:00
Dean Herbert
aff218dfd5
Redirect through validity function rather than overriding Sort
2022-11-18 16:03:40 +09:00
Dean Herbert
20af8217f4
Tidy up bindable flow
2022-11-18 15:50:41 +09:00
Dean Herbert
e4f522aad1
Fix inspections / typos
2022-11-18 15:47:37 +09:00
Dean Herbert
d17c091d63
Move constant to a better location
2022-11-18 15:47:31 +09:00
Dean Herbert
3faa7f5f74
Merge branch 'master' into gameplay-leaderboard-fix
2022-11-18 15:44:30 +09:00
Salman Ahmed
90cd386323
Fix timeline potentially scrolling at extents while not dragging
2022-11-18 09:43:16 +03:00
Dan Balasescu
219d049edf
Merge pull request #21140 from maromalo/long-standard
...
Standardise scores to `long` type
2022-11-18 15:26:33 +09:00
Dan Balasescu
57b8495c7a
Merge branch 'master' into long-standard
2022-11-18 14:24:04 +09:00
Dean Herbert
e4d134a820
Reduce time waited on a score submission token from 60 to 30s
2022-11-18 14:07:40 +09:00
Dean Herbert
1ff1738988
Merge pull request #21244 from nanashi-1/beatmapoptions-disabled
...
Disable certain beatmap option buttons when there are no beatmaps selected
2022-11-18 12:55:07 +09:00
Dawid Sośnia
0dbf491872
Merge branch 'master' into gameplay-leaderboard-fix
2022-11-17 22:06:51 +01:00
Piggey
eb691266c1
cleanup
2022-11-17 21:50:39 +01:00
Dean Herbert
20d87fbed4
Eagerly dispose of triangles intro textures to avoid holding for full length of game session
2022-11-17 23:05:34 +09:00
Piggey
fa00fc5c6d
change scoresType to be a bindable
2022-11-17 13:27:56 +01:00
Piggey
dea2a6ed8d
override sort() function in SoloGameplayLeaderboard
2022-11-17 12:12:36 +01:00
nanashi-1
4773979e52
add condition
2022-11-17 16:15:34 +08:00
Dean Herbert
a4e713a61f
When returning to the editor after test play, use the original editor time rather than the point of exit
2022-11-17 12:36:24 +09:00
Dean Herbert
bfcd9e0f45
Don't seek to current editor location when location is close to (or before) the first object
2022-11-17 12:32:35 +09:00
Salman Ahmed
87b4fee10f
Remove leftover constant
2022-11-17 04:05:21 +03:00
Salman Ahmed
55beaf5d93
Revert buttons order change
2022-11-17 04:05:15 +03:00
Salman Ahmed
039ab83a46
Disable beatmap options button when none selected
2022-11-17 04:00:23 +03:00
Salman Ahmed
0e46614c57
Revert beatmap option button state changes
2022-11-17 03:57:01 +03:00
Salman Ahmed
7a28a7f2a0
Move IGameplaySettings override to compose screen to keep test mode unaffected
2022-11-17 01:45:16 +03:00
Dean Herbert
ee6fffec5f
Fix combo colour normalisation setting not applying to editor test play
2022-11-16 17:54:49 +09:00
nanashi-1
5d8d8ffce5
fix naming
2022-11-16 10:09:51 +08:00
nanashi-1
55edd6c907
add space
2022-11-16 09:58:49 +08:00
nanashi-1
1fb8357e93
change disabledAlpha from readonly to const
2022-11-16 09:58:32 +08:00
nanashi-1
9101ad0cbd
fixed naming
2022-11-16 09:42:40 +08:00
nanashi-1
5973bb1956
AddButton now returns the button
2022-11-15 20:57:31 +08:00
nanashi-1
1186ed3e32
add disable
2022-11-15 20:56:18 +08:00
nanashi-1
e8d170e772
disable certain options when no beatmap is selected
2022-11-15 20:55:55 +08:00
Dean Herbert
489dca79a1
Remove upper limit for pooling
2022-11-15 12:31:25 +09:00
Dean Herbert
308ed1abd1
Fix number of judgements shown potentially exceeding upper limit
2022-11-15 12:31:25 +09:00
Dean Herbert
59a8603728
Ensure flowing animation starts correctly from zero
2022-11-15 12:04:40 +09:00
Dean Herbert
aef6ee23eb
Apply pooling support to ColourHitErrorMeter
2022-11-15 12:04:40 +09:00
Dean Herbert
a86b50d62a
Apply nullability to BarHitErrorMeter
2022-11-15 11:33:27 +09:00
Dean Herbert
576f462f59
Add pooling support to BarHitErrorMeter
2022-11-15 11:33:27 +09:00
maromalo
1911120afe
Merge branch 'master' into long-standard
2022-11-12 09:52:11 -03:00
Thomas Müller-Höhne
fa8e38d9d6
Target rounded fragment shader
...
Compatibility with osu-framework change https://github.com/ppy/osu-framework/pull/5512
2022-11-12 17:18:23 +09:00
Dan Balasescu
db25e9e9c8
Merge branch 'master' into combo-colour-brightness-limit
2022-11-11 15:31:28 +09:00
Dan Balasescu
94772a9cda
Merge pull request #21147 from peppy/fix-timeline-editor-crash
...
Fix editor hard crash when beatmap file specified out-of-range timeline zoom value
2022-11-10 22:59:55 +09:00
Dan Balasescu
606d42c679
Merge pull request #21184 from peppy/skinnable-things-cleanup
...
Skinnable class naming pass
2022-11-10 12:52:08 +09:00
Dan Balasescu
051f7f4c68
Merge pull request #21173 from peppy/toggle-hit-markers
...
Add the ability to toggle off hit marker displays in the editor
2022-11-10 12:23:53 +09:00
Dean Herbert
3547c04002
Merge branch 'master' into skinnable-things-cleanup
2022-11-10 12:09:32 +09:00
Piggey
0011f4e7be
fix comment lol
2022-11-09 19:59:04 +01:00
Piggey
4fbc240aa1
Merge remote-tracking branch 'origin/gameplay-leaderboard-fix' into gameplay-leaderboard-fix
2022-11-09 19:53:56 +01:00
Piggey
ab53fb17d3
change displayed text from #? to -
2022-11-09 19:53:36 +01:00
Dean Herbert
1aa0e40f2f
Add "Component" prefix to lookup naming
2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94
Rename SkinnableTarget to GlobalSkinLookup
2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b
Rename ISkinComponent to ISkinLookup
2022-11-09 17:46:43 +09:00
Dean Herbert
4457648b1c
Fix editor playing too many sounds when user performs a manual seek during playback
2022-11-09 17:42:33 +09:00
Dawid Sośnia
9549e55ef8
Merge branch 'ppy:master' into gameplay-leaderboard-fix
2022-11-08 20:04:13 +01:00
Piggey
d48c56818f
change positionText to display "#?" if tracked score is being 51st on the leaderboard
2022-11-08 20:02:21 +01:00
Dean Herbert
4448fcb3c8
Override combo colour brightness normalisation setting only in editor
2022-11-08 18:29:10 +09:00
Dean Herbert
ada039151b
Add the ability to toggle off hit marker displays in the editor
2022-11-08 18:07:06 +09:00
Dean Herbert
9650ae1329
Limit editor background dim to 75% maximum
2022-11-08 17:20:37 +09:00
Dean Herbert
349d262c18
Remove commented unbind
2022-11-08 17:19:48 +09:00
Dean Herbert
b166e477c2
Merge branch 'master' into editor-background
2022-11-08 17:18:34 +09:00
Salman Ahmed
1465d043f4
Merge branch 'master' into song-select-transition-improvement
2022-11-08 03:36:19 +03:00
Dean Herbert
f6d93fcd5a
Fix editor hard crash when beatmap file specified out-of-range timeline zoom value
2022-11-07 12:54:02 +09:00
Dean Herbert
391840404d
Play exiting transition in both directions
2022-11-07 11:59:43 +09:00
maromalo
8eef2ba8de
quality shenanigans
2022-11-06 20:12:26 -03:00
maromalo
b7ef9b176d
Make score type consistent
2022-11-06 19:59:27 -03:00
Bartłomiej Dach
84179fb087
Merge branch 'master' into combo-colour-brightness-limit
2022-11-05 16:48:56 +01:00
Dean Herbert
4f14ae4e34
Adjust transition effect for main menu backgrounds
2022-11-04 17:45:14 +09:00
Dean Herbert
2b934e0bea
Increase delay for changing background on returning to main menu
2022-11-04 17:45:13 +09:00
Dean Herbert
c40c70509e
Improve song select transition to gameplay
2022-11-04 15:24:37 +09:00
Dean Herbert
486515ed90
Merge pull request #20758 from frenzibyte/maintain-common-mod-selection
...
Maintain selection of common mods when switching rulesets
2022-11-03 20:08:32 +09:00
Dean Herbert
e336d486a6
Merge pull request #21093 from peppy/auto-skip-multiple-times
...
Fix automated skip not skipping more than once when required
2022-11-03 15:46:56 +09:00
Dean Herbert
20dd405c2b
Merge branch 'master' into maintain-common-mod-selection
2022-11-03 15:32:40 +09:00
Dan Balasescu
fc191807c6
Fix velocity test failing with no audio device
2022-11-03 13:59:22 +09:00
Dean Herbert
4154be6cda
Adjust auto-skip to skip multiple times if necessary
2022-11-03 13:52:29 +09:00
Dean Herbert
aef3c7918c
Add total skip count to SkipOverlay
2022-11-03 13:52:24 +09:00
Dean Herbert
3ec9686e58
Fix test failures and rename configuration value to match better
2022-11-02 18:15:18 +09:00
Dean Herbert
0e502de8b4
Rename field to match usage
2022-11-02 18:04:42 +09:00
Dean Herbert
c3eb0c6330
Merge branch 'master' into editor-background
2022-11-02 17:43:38 +09:00
cdwcgt
9884618290
rename editorDim to editorBackgroundDim
2022-11-02 15:12:15 +09:00
cdwcgt
d6b8439121
add xmldoc for DimAmount
2022-11-02 15:11:49 +09:00
Dean Herbert
37300ba9e2
Standardise "Visual Settings" components to fix mismatched paddings and labels
2022-11-02 14:01:57 +09:00
Dean Herbert
50b6fe4acb
Localise new label
2022-11-02 14:01:03 +09:00
Dean Herbert
61fc3c8cc0
Add setting to visual settings toolbox
2022-11-02 13:58:34 +09:00
Dean Herbert
d8aa06ea92
Standardise "Visual Settings" components to fix mismatched paddings and labels
2022-11-02 13:55:56 +09:00
Dean Herbert
2a88409dfe
Fix time snap of sliders not matching when SV is not 1.0x
...
This regressed with https://github.com/ppy/osu/pull/20850 because the
function was used in other places which expect it to factor slider
velocity into the equation.
Rather than reverting, I've added a new argument, as based on the method
naming alone it was hard to discern whether SV should actually be
considered.
The reason for the change in #20850 was to avoid the SV coming in from a
reference object which may not have a correct SV in the first place. In
such cases, passing `false` to the function will give the expected
behaviour.
2022-11-01 15:12:58 +09:00
Dean Herbert
9ea2bd84bd
Merge pull request #21018 from andy840119/reuse-the-function-in-timeline-class
...
Reuse function in the timeline class
2022-10-30 23:49:02 +09:00
Dean Herbert
1035b5fb19
Fix hold to pause button not working when HUD is hidden
2022-10-30 21:38:45 +09:00
andy840119
a753369d3e
Reuse function TimeAtPosition() and PositionAtTime().
2022-10-30 17:21:50 +08:00
D.Headley
21d68bfb84
Delete unused button
2022-10-28 16:40:21 +02:00
Joseph Madamba
87328dd1f5
Fix bar hit error meter labels not clearing when setting to none
2022-10-27 23:59:01 -07:00
Dan Balasescu
51d8392e7f
Merge pull request #20982 from peppy/remove-obsoleted-simple
...
Clean up various obsoleted code
2022-10-28 14:36:04 +09:00
Dean Herbert
42eafe318c
Remove various simple obsoletions
2022-10-28 13:20:58 +09:00
Dean Herbert
71970d83cf
Remove obsoleted ShowProgressGraph global setting
...
This was moved to the component itself.
2022-10-28 12:47:45 +09:00
Joseph Madamba
0efbae6e70
Fix osu! logo drag area being a square
2022-10-26 18:33:07 -07:00
cdwcgt
6991195d69
let editor dim different from gameplay dim
2022-10-26 15:22:57 +09:00
Dean Herbert
2016d33055
Offset start of distance snap grid drawing if reference object's start time doesn't align
...
Closes #20938 .
2022-10-26 13:11:26 +09:00
Dean Herbert
7249542167
Merge pull request #20912 from LittleEndu/carousel-do-not-select-random
...
Make beatmap carousel select nearest to selection when selection was filtered
2022-10-26 11:40:56 +09:00
Dean Herbert
d9d083752a
Clamp backwards index to total current items to fix edge case of item removal
2022-10-26 11:03:11 +09:00
Bartłomiej Dach
f5ca447b8e
Rename one more "{duplicate -> clone}" reference
2022-10-25 21:34:41 +02:00
Bartłomiej Dach
bcdf24b972
Merge branch 'master' into add-editor-object-clone
2022-10-25 21:33:52 +02:00
Dean Herbert
cf3bf41b49
Harden and simplify logic to avoid weird issues
2022-10-25 18:57:15 +09:00
Dean Herbert
22ea9a8ab4
Add early return of carousel group has no items
2022-10-25 13:34:22 +09:00
cdwcgt
f9c6190426
Add DimAmount for UserDimContainer
2022-10-25 13:00:53 +09:00
Dean Herbert
2456a18bc1
Rewrite implementation to avoid duplicated LINQ returns
2022-10-25 12:48:17 +09:00
Dean Herbert
4d4f6e25ba
Rename to "clone" instead of "duplicate"
2022-10-25 11:43:23 +09:00
Dean Herbert
1e579e06f8
Fix duplicate working incorrectly if there is no selection currently made
2022-10-25 11:42:12 +09:00
Endrik Tombak
5a118cfdc3
Merge branch 'master' of https://github.com/ppy/osu into carousel-perform-selection
...
Conflicts:
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
2022-10-24 21:40:48 +03:00
cdwcgt
a2682b3ce3
background dim settings for editor
...
View -> Background Dim
follow `DimLevel` and `BlurLevel`
Co-Authored-By: Dead_Bush_Sanpai <DeadBushSanpai@yandex.com>
2022-10-24 23:55:33 +09:00
cdwcgt
de881cc5cb
useless #nullable disable
2022-10-24 23:17:28 +09:00
Dean Herbert
1d5df15027
Add ability to use Shift+Number to set current beat divisor in editor
2022-10-24 15:20:15 +09:00
Dean Herbert
e72a71a28e
Add simple editor "duplicate objects" key binding
2022-10-24 14:01:34 +09:00
Dean Herbert
6b26547d03
Merge pull request #20835 from frenzibyte/improve-hide-mouse-on-keyboard
...
Improve automatic cursor hiding logic and limit to gameplay screen
2022-10-20 11:44:20 +09:00
Dean Herbert
2f8a4fd2d0
Merge branch 'master' into remove-current-item
2022-10-20 10:02:09 +09:00
Dean Herbert
77b25c4a5c
Merge pull request #20788 from frenzibyte/handle-submitting-player-request-timeout
...
Fix potential exception in `SubmittingPlayer` token retrieval on request timeout
2022-10-20 09:51:57 +09:00
Salman Ahmed
4bf4938b72
Keep cursor hiding feature to gameplay screens for now
2022-10-20 03:44:58 +03:00
Dean Herbert
fbad33bef7
Adjust durations and make start off screen
2022-10-18 15:01:53 +09:00
Dean Herbert
84688b53a1
Merge branch 'fix-editor-padding' into player-loader-improvements
2022-10-18 14:52:59 +09:00
Dean Herbert
6a7f6c76ff
Fix osu! editor padding being applied to toolboxes
...
The result of https://github.com/ppy/osu/pull/20739 and https://github.com/ppy/osu/pull/20738 having unintended side effects when applied together.
2022-10-18 14:32:00 +09:00
Dean Herbert
0f809dcaa7
Merge branch 'master' into player-loader-improvements
2022-10-18 14:22:55 +09:00
Dean Herbert
516320edd9
Merge branch 'master' into handle-submitting-player-request-timeout
2022-10-17 18:51:13 +09:00
Dan Balasescu
4220d6b3fc
Merge pull request #20780 from outfoxxed/fix-hiterror-icons
...
Fix hit error bar icon orientation
2022-10-17 18:48:31 +09:00
Dean Herbert
1e7b8cd227
Fix formatting issues
2022-10-17 13:22:06 +09:00
Salman Ahmed
ae05f374a2
Fix potential invalid operation exception in SubmittingPlayer token retrieval
2022-10-17 03:26:29 +03:00
outfoxxed
85de802793
Only create hit error bar icon containers once
...
Move icon container creation to BDL, and only recreate the contained
icon when `recreateLabels` is called
2022-10-16 11:47:21 -07:00
outfoxxed
d6030891a2
Reuse existing code in hit error bar fix
...
Use `UprightAspectMaintainingContainer` instead of a local fix for
hit error bar orientation
2022-10-16 10:06:38 -07:00
outfoxxed
cd1885a17b
Fix hit error bar icon orientation
...
Icons now keep their original orientation when the hit error bar is
flipped
2022-10-16 02:55:10 -07:00
Salman Ahmed
324c749383
Merge branch 'master' into player-loader-improvements
2022-10-15 03:07:15 +03:00
Salman Ahmed
ba72f13f54
Merge branch 'master' into hide-mouse-on-keyboard-input
2022-10-14 22:26:30 +03:00
Dan Balasescu
10aabfc650
Merge pull request #20739 from peppy/settings-toolbox
...
Adjust visuals of settings toolboxes (gameplay loading screen and editor)
2022-10-14 20:31:05 +09:00
Dan Balasescu
dcb6357964
Add ability to remove the current item in multiplayer
2022-10-14 20:23:55 +09:00
Dan Balasescu
525f98c158
Fix max combo missing from playlists results screen
2022-10-14 18:01:54 +09:00
Salman Ahmed
01c65d3cc1
Remove seemingly unnecessary/leftover code
2022-10-14 02:16:36 +03:00
Dean Herbert
3645269108
Improve logo transition and reduce delay of exiting player loader in optimal conditions
2022-10-13 17:29:47 +09:00
Dean Herbert
b33935e392
Fix player loading screen settings scaling in
...
This always looked weird, and from the looks of the structure was
probably unintentional from the start (it is in the logo tracking
container for whatever reason).
2022-10-13 17:12:36 +09:00
Dean Herbert
15f9697c9f
Roughly update design of editor buttons
2022-10-13 16:57:25 +09:00
Dean Herbert
0f4a2a6059
Improve feel of settings toolbox group
2022-10-13 16:36:19 +09:00
Dean Herbert
c3902728f6
Reorganise beatmap snap control to work better in compact mode
2022-10-13 15:47:54 +09:00
Dean Herbert
a525b3f9f8
Reorder and rename toggle checkboxes to fit better
2022-10-13 15:44:33 +09:00
Dean Herbert
f6f5d33f53
Add slight padding to playfield (roughly matches stable)
2022-10-13 15:44:23 +09:00
Dean Herbert
ebc1088457
Merge pull request #20729 from frenzibyte/update-local-confirmation-dialog
...
Request user confirmation on updating locally-modified beatmaps
2022-10-13 12:36:37 +09:00
Dean Herbert
c9b4cacc20
Merge pull request #20724 from mk56-spn/Highest_Combo_Counter
...
Add "longest combo" counter to HUD components.
2022-10-13 12:26:49 +09:00
Salman Ahmed
964ed01abb
Add confirmation dialog for updating locally modified beatmaps
2022-10-13 02:40:15 +03:00
Dean Herbert
19f3810020
Revert namespace change
...
Let's not
2022-10-12 18:50:47 +09:00
Dan Balasescu
9473c350b5
Merge pull request #20266 from cdwcgt/catch-combo-hide
...
Fade out CatchComboDisplay when hide HUD
2022-10-12 16:59:07 +09:00
Dario Headley
b72c8970eb
Max Combo Counter added
2022-10-12 09:50:01 +02:00
Dan Balasescu
300888b423
Merge pull request #20720 from peppy/fix-welcome-intro-delay
...
Fix incorrect delay for non-theme music on "welcome" intro
2022-10-12 16:15:54 +09:00
Dean Herbert
d2d589a156
Expose HUD state via Player
2022-10-12 15:11:52 +09:00
Dean Herbert
1d6d047a69
Merge branch 'master' into master
2022-10-12 14:52:07 +09:00
Dean Herbert
d6998c810c
Fix incorrect delay for non-theme music on "welcome" intro
2022-10-12 14:51:14 +09:00
Dean Herbert
db148d145b
Fix incorrect offset logic for beatmaps without a preview point specified
2022-10-12 14:47:37 +09:00
Dean Herbert
ab24e87013
Merge branch 'master' into improve-drag-selection
2022-10-12 13:20:17 +09:00
Dean Herbert
a5948e7680
Merge pull request #20704 from ekrctb/scrolling-drag-box
...
Anchor editor drag box on time (catch, mania)
2022-10-12 11:48:05 +09:00
ekrctb
fcb9e2cc00
Refactor blueprint container drag code
2022-10-11 22:39:53 +09:00
Salman Ahmed
9b45a9cf76
Rename various cursor symbols
...
- `IProvideCursor.MenuCursor` -> `IProvideCursor.Cursor`
- `MenuCursor` -> `MenuCursorContainer
2022-10-11 16:21:01 +03:00
Dan Balasescu
cc0ca470f1
Merge pull request #20702 from peppy/update-prefer-no-video
...
Fix beatmap update button not respecting user "prefer no video" setting
2022-10-11 19:36:14 +09:00
Dan Balasescu
88e82d3154
Merge pull request #20681 from peppy/fix-hidden-hud-interaction
...
Fix HUD components being interactive even when the HUD is visually hidden
2022-10-11 17:19:27 +09:00
NotGumballer91
d18466d740
Fix delay inconsistency in IntroCircles.cs
2022-10-11 16:16:57 +08:00
NotGumballer91
5baad52a9e
Fix unintended delay on osu!theme
2022-10-11 16:15:56 +08:00
Dean Herbert
f41b79688f
Avoid casting by accepting all Playfields but throwing on a bad choice
2022-10-11 16:54:41 +09:00
Dean Herbert
a44ba579c5
Fix beatmap update button not respecting user "prefer no video" setting
...
Closes #20701 .
2022-10-11 14:27:40 +09:00
ekrctb
6ab29a62d0
Anchor drag box on time (catch, mania)
...
Not done for taiko because I cannot figure out how it should work with the overlapping scroll algorithm.
2022-10-11 14:23:17 +09:00
ekrctb
1a24762f9b
Improve drag box selection logic
...
`AllowDeselectionDuringDrag` is remove.
Instead, selected hit objects are not automatically deselected
when clock is seeked to a later time (the hit object is dead).
Update drag box selection even if mouse is not moved
(in case clock is running or scroll wheel is used).
2022-10-11 14:11:45 +09:00
Dean Herbert
cb21126623
Merge pull request #20586 from ekrctb/time-based-selection
...
Use hit object time for timeline drag selection instead of relying on blueprint
2022-10-11 13:20:15 +09:00
NotGumballer91
ef840e98cf
Update IntroCircles.cs
2022-10-11 01:49:53 +08:00
NotGumballer91
8a4f2efa14
Update IntroScreen.cs
2022-10-11 01:49:49 +08:00
NotGumballer91
9a3689b6e9
Update IntroCircles.cs
2022-10-10 21:04:14 +08:00
Dean Herbert
20adc522b9
Fix HUD components being interactive even when the HUD is visually hidden
2022-10-10 16:05:41 +09:00
