Dan Balasescu
1d1012e196
Merge pull request #20286 from peppy/gameplay-leaderboards
...
Add basic gameplay leaderboard display
2022-09-22 21:16:12 +09:00
Dan Balasescu
6a0047b7a2
Update location of FullscreenCapability bindable
2022-09-22 21:01:23 +09:00
Dan Balasescu
445e026a32
Merge pull request #20389 from peppy/fix-gameplay-leaderboard-layout
...
Fix gameplay leaderboard sometimes not showing up
2022-09-22 20:51:54 +09:00
Dean Herbert
8f7a306d81
Inline comment regarding margin necessity
2022-09-22 19:53:16 +09:00
Dean Herbert
f0dcda9acc
Decrease precision of spacing setting
2022-09-22 15:49:02 +09:00
Dean Herbert
26d98323ff
Fix bindable flow, code quality, everything
2022-09-22 15:45:23 +09:00
Dean Herbert
0f663deda0
Fix changing shape causing alpha to be permanently reset to zero
2022-09-22 15:24:57 +09:00
Dean Herbert
ae70b2c32f
Fix other weirdness in variable and description naming
2022-09-22 15:21:27 +09:00
Dean Herbert
19db7c5977
Remove "Opacity" setting
...
This should be implemented at a higher level
2022-09-22 15:19:01 +09:00
Dean Herbert
f3898da37a
Rename judgement count to not mention "shape"
2022-09-22 15:18:20 +09:00
Dean Herbert
7d93fa9f65
Merge branch 'master' into Colour_hit_meter_improved
2022-09-22 15:11:58 +09:00
Dean Herbert
5b73f24864
Fix outdated scores being held by BeatmapLeaderboard after external beatmap switch
2022-09-21 15:21:32 +09:00
Dean Herbert
29c4d06d36
Merge branch 'fix-gameplay-leaderboard-layout' into gameplay-leaderboards
2022-09-21 14:58:58 +09:00
Dean Herbert
b04871f40a
Animate scroll for a better visual experience
2022-09-21 14:51:12 +09:00
Dean Herbert
087ca59ebb
Add extra margin space to flow equal to height of leaderboard
...
This ensures the content is always on screen, but also accounts for the
fact that scroll operations without animation were actually forcing the
local score to a location it can't usually reside at.
Basically, the local score was in the scroll extension region (due to always trying
to scroll the local player to the middle of the display, but there being
no other content below the local player to scroll up by).
2022-09-21 14:51:12 +09:00
Dean Herbert
4385001d28
Fix solo leaderboard seeing imported score via realm subscription flow
2022-09-21 13:59:11 +09:00
Dean Herbert
a8338c4efd
Add local score after existing scores to avoid initial re-sort
2022-09-21 13:38:40 +09:00
Dean Herbert
4492a26b59
Merge branch 'master' into argon-skin
2022-09-21 13:00:16 +09:00
Dan Balasescu
8bf196d561
Merge pull request #20354 from peppy/default-skin-refactor
...
Rename default skin to make way for new version
2022-09-21 11:48:38 +09:00
Dan Balasescu
7f15dc6e6c
Merge pull request #20321 from HiddenNode/fix_graph_info_overlap
...
Fix Progress bar info text overlapping with progress graph
2022-09-20 19:30:51 +09:00
Dan Balasescu
80d8eedb7c
Merge pull request #20366 from peppy/fix-nullable-download-progress
...
Fix multiplayer crashes due to incorrect download state
2022-09-20 17:16:11 +09:00
Dean Herbert
68c040175a
Ensure Leaderboard.Scores is updated immediately via request flow
2022-09-20 17:02:57 +09:00
Dean Herbert
b5771ece41
Reduce the amount by which clicking the mute notification incraeses volume
2022-09-20 13:00:08 +09:00
Dean Herbert
a9c120c214
Reduce volume requirement for showing muted notification to 1%
2022-09-20 12:46:35 +09:00
Dean Herbert
1c02fa8399
Update comment to not mention horizontal plane
2022-09-20 00:08:06 +09:00
Dean Herbert
46db3ad96d
Move implementation to individual classes
2022-09-20 00:06:02 +09:00
Dean Herbert
0f7b38f4c3
Add new default skin "argon"
2022-09-19 23:16:46 +09:00
Dean Herbert
0ac28cbecc
Fix potential crash from missing DownloadProgress
2022-09-18 23:42:16 +09:00
Dean Herbert
1914c41d0d
Merge pull request #20353 from Drison64/fix-timelineZoom-zero
...
EditorBeatmap's TimelineZoom should never be zero
2022-09-18 18:06:26 +09:00
Dan Balasescu
2dcaf7cfd8
Fix memory leak due to missing event unbind
2022-09-18 14:25:31 +09:00
Drison64
c075d3de08
Create a test and a check if initial zoom value of ZoomableScrollContainer is in range
2022-09-17 22:43:40 +02:00
Ondřej Vajďák
9d94343317
Update osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
...
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2022-09-17 19:51:44 +02:00
Drison64
c8768eb399
Changed == to <= on TimelineZoom check
2022-09-17 19:00:50 +02:00
Drison64
3c7ea5c8fa
Update
2022-09-17 18:57:09 +02:00
Dean Herbert
41e69fbca6
Remove "default" prefix from naming
2022-09-18 00:15:26 +09:00
Dean Herbert
51841988bf
Rename references to DefaultSkin to have Triangles suffix
2022-09-17 23:57:25 +09:00
HiddenNode
2dfa89c62e
Clean up
2022-09-17 15:05:25 +01:00
Drison64
0b6a77bc8b
EditorBeatmap's TimelineZoom should never be zero
2022-09-17 15:59:42 +02:00
HiddenNode
d580b07063
Refactor update condition logic
2022-09-17 14:40:36 +01:00
HiddenNode
e3d5ba5301
Check if graph DrawSize changed
2022-09-17 11:44:25 +01:00
HiddenNode
0d76f4501d
Revert "Set InvalidationSource to Self"
...
This reverts commit 2092008251
2022-09-17 10:10:20 +01:00
Dean Herbert
4c4fdfd153
Provide scores directly to Player instance rather than relying on DI
2022-09-16 18:15:17 +09:00
Dean Herbert
0227eddda1
Merge branch 'master' into gameplay-leaderboards
2022-09-16 15:44:58 +09:00
Dan Balasescu
d9499abc33
Refactor to avoid passing around bindables
2022-09-16 13:14:25 +09:00
Drison64
4f208416be
Fixed irresponsiveness of score panel timestamp to time format
2022-09-16 13:50:18 +14:00
HiddenNode
2092008251
Set InvalidationSource to Self
2022-09-15 11:16:00 +01:00
HiddenNode
8286ab0d04
Revert "Fix SongProgress invalidating too often"
...
This reverts commit 2b4b14ca99
2022-09-15 11:11:58 +01:00
Dean Herbert
40a60f7145
Remove all entity framework code and migrations
2022-09-15 16:58:58 +09:00
Dean Herbert
eb18d3661d
Merge pull request #20309 from mk56-spn/dead_class_removal
...
Unused class KeyCounterState.cs Removal
2022-09-15 03:38:39 +09:00
Mk-56spn
d6db82283a
Removes unused class
2022-09-14 18:01:29 +02:00
Dean Herbert
fcf54f1bc8
Fix gameplay leaderboard not being sorted correctly in tie situations
2022-09-14 14:18:12 +09:00
Dean Herbert
8a6977213a
Fix displayed scores in gameplay leaderboard not tracking display mode changes
2022-09-14 14:02:35 +09:00
Dean Herbert
b4e6a20846
Fix song select status prefix matching no longer working
...
Regressed in #19275 due to weird logic.
Closes #20289 .
2022-09-14 12:59:05 +09:00
Dean Herbert
81b5e4a865
Fix back-to-front condition on leaderboard always show configuration
2022-09-13 19:57:40 +09:00
Dean Herbert
94693a4667
Fix oversight when making interface implementation explicit
2022-09-13 19:55:57 +09:00
Dean Herbert
e15a25ea49
Fix leaderboard positioning logic to actually consider elements on the left side
2022-09-13 18:45:11 +09:00
Dean Herbert
678eec1c67
Move LeaderboardFlow to HUDOverlay to share positioning logic
2022-09-13 18:45:11 +09:00
Dean Herbert
5894d2f0bc
Ensure gameplay leaderboard hides with rest of HUD when it should
2022-09-13 18:45:11 +09:00
Dean Herbert
6d167070f8
Add back DI leaderboard retrieval via bindable pathway
2022-09-13 18:45:11 +09:00
Dean Herbert
70e6b595f1
Refactor SoloGameplayLeaderboard to not read scores via DI
...
Also allows updating scores if they arrive late.
2022-09-13 18:00:21 +09:00
Dean Herbert
d2b80645ab
Change Leaderboard to use IUser instead of APIUser
2022-09-13 18:00:21 +09:00
Dean Herbert
d251c0b2ac
Move leaderboard implementation to Player itself
2022-09-13 18:00:21 +09:00
Dean Herbert
368faa0084
Make constructor protected in base implementation
2022-09-13 18:00:21 +09:00
Dean Herbert
4c669e2bce
Track local Player.Score's user rather than using APIProvider
2022-09-13 18:00:21 +09:00
Salman Ahmed
3490b16056
Add simplified SoloGameplayLeaderboard implementation
...
Note that this doesn't support waiting until leaderboard finishes fetching scores.
2022-09-13 18:00:21 +09:00
Dean Herbert
27a81dfb9f
Merge pull request #20270 from OliBomby/fix-selectionblueprint-order
...
Fixed HitObjectOrderedSelectionContainer being able to become unsorted and causing crashes
2022-09-13 17:18:58 +09:00
Dan Balasescu
0e2155303e
Merge branch 'master' into fix-song-progress-invalidations
2022-09-13 16:07:05 +09:00
Dean Herbert
f53507828c
Rename event to be more generic (and add comprehensive xmldoc)
2022-09-13 14:59:30 +09:00
Dean Herbert
ac034bffeb
Fix potential crash if multiplayer spectator load is aborted early
2022-09-13 14:21:54 +09:00
OliBomby
fd48249eef
fix with new event
2022-09-13 02:20:52 +02:00
OliBomby
718f8c4ee2
revert the fix
2022-09-13 01:09:42 +02:00
OliBomby
8400de4b2e
invoking hitobject updated before invoking removed
2022-09-12 17:50:11 +02:00
Dean Herbert
2b4b14ca99
Fix SongProgress invalidating too often
...
This regressed with https://github.com/ppy/osu/pull/19556 . Rather than
try and figure whether that new container needs to handle size
differently, this is a simple solution.
Height was taken from a runtime check (maxes out at about 14.5).
Closes #20235 .
2022-09-12 20:06:53 +09:00
Dean Herbert
cb6d02ec3a
Merge pull request #19066 from andy840119/remove-the-nullable-disable-in-the-ruleset
...
Remove the nullable disable annotation in the ruleset class
2022-09-12 19:07:23 +09:00
Dan Balasescu
4b37330316
Merge pull request #20248 from acid-chicken/fix/stats/td
...
Fix new hit distribution graph didn't account for size changes
2022-09-12 18:11:18 +09:00
Dan Balasescu
3cfacb5e39
Merge pull request #20257 from peppy/update-button-show-login
...
Show login overlay when attempting to update a beatmap while logged out
2022-09-12 17:51:45 +09:00
Acid Chicken (硫酸鶏)
4f298db066
fix(osu.Game): reset Y axis of the bars in hit distribution graph at the first drawing
2022-09-12 16:25:29 +09:00
Acid Chicken (硫酸鶏)
0d0e2e7bcc
fix(osu.Game): bars in hit distribution graph stretching in the opposite direction when DrawHeight is less than DrawWidth
2022-09-12 16:20:33 +09:00
Dan Balasescu
31225066a1
Merge pull request #19308 from frenzibyte/top-rank-badge-order
...
Fix best rank badge not handling legacy scores properly
2022-09-12 16:20:21 +09:00
Dean Herbert
94f8197e22
Show login overlay when attempting to update a beatmap while logged out
2022-09-12 16:15:14 +09:00
Dean Herbert
96951057df
Avoid using bindables
2022-09-12 15:56:06 +09:00
Dean Herbert
bcd2445d9b
Move helper functions down in file
2022-09-12 15:50:10 +09:00
Dean Herbert
0755289ec3
Apply NRT to HitEventTimingDistributionGraph
2022-09-12 15:48:50 +09:00
Acid Chicken (硫酸鶏)
ac324c63e2
fix(osu.Game): handle size changes in timing distribution graph
2022-09-12 04:46:32 +09:00
Mk-56spn
c00bf61273
Framework change adressed
2022-09-10 21:24:29 +02:00
MK56
8661dc3c93
Merge branch 'ppy:master' into Colour_hit_meter_improved
2022-09-10 21:16:23 +02:00
Mk-56spn
f6aef73f9e
fixed shape bindable not working, test creation, removal of Clear(), adjusted settings names
2022-09-10 20:30:43 +02:00
andy840119
3d7367a842
Move the CreateConvertibleReplayFrame() into the base ruleset class for avoid api breaking change in the customized ruleset.
2022-09-10 11:07:23 +08:00
andy840119
e62999fb16
Merge branch 'master' of https://github.com/ppy/osu into remove-the-nullable-disable-in-the-ruleset
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Osu/OsuRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
# osu.Game/Rulesets/Ruleset.cs
2022-09-10 10:40:12 +08:00
Salman Ahmed
95062c2cc8
Remove center origin specification to avoid single-frame layout issues
2022-09-09 19:42:58 +03:00
Salman Ahmed
dd10a06e3d
Merge branch 'master' into top-rank-badge-order
2022-09-09 19:38:44 +03:00
solstice23
823078ed2d
Merge branch 'master' into search-filter
2022-09-09 23:12:37 +08:00
Dean Herbert
602ffebd54
Apply NRT and fix code style
2022-09-09 23:29:04 +09:00
Dean Herbert
d961b96897
Merge branch 'master' into search-filter
2022-09-09 23:25:54 +09:00
Dean Herbert
27f745b980
Merge branch 'master' into fix_progress_bar_info
2022-09-09 17:34:13 +09:00
Dean Herbert
05797cb9e5
Fix enum to STRING????????? conversion (and use bindable flow)
2022-09-09 16:30:08 +09:00
Dean Herbert
f1fa442287
Merge pull request #19599 from ItsShamed/kps
...
Add clicks/second counter to HUD
2022-09-09 01:50:12 +09:00
Dean Herbert
6945c43e0d
Merge pull request #20178 from smoogipoo/fix-match-creation-beatmap-select
...
Fix several weird scenarios with online play song selection
2022-09-08 23:07:09 +09:00
Dean Herbert
45239fc737
Update TrueGameplayRate accessing
2022-09-08 23:03:15 +09:00
Dean Herbert
d4afc3629c
Merge branch 'master' into kps
2022-09-08 23:00:36 +09:00
Dan Balasescu
9aab502adc
Merge pull request #20157 from peppy/true-gameplay-rate
...
Refactor `TrueGameplayRate` to account for only gameplay adjustments, no matter what
2022-09-08 19:54:32 +09:00
Dan Balasescu
4fc03998a1
Merge pull request #20189 from peppy/fix-playlist-item-download-button-visibility
...
Fix playlist items showing download button briefly during initial display
2022-09-08 19:47:35 +09:00
Dean Herbert
096d1c3ff3
Merge pull request #20143 from acid-chicken/feat/stats/colored-td
...
Show judgement colours in hit distribution graph
2022-09-08 19:15:40 +09:00
Dean Herbert
13d9b2188b
Merge pull request #20145 from smoogipoo/multiple-countdowns
...
Implement support for multiple active countdowns in multiplayer
2022-09-08 19:15:30 +09:00
Dean Herbert
a98c6b2c1f
Add comment metioning why we need to use DrawableRuleset lookup
2022-09-08 19:14:23 +09:00
Mk-56spn
07c16224d2
Fix Main file issues
2022-09-08 11:58:14 +02:00
Dean Herbert
5c2fb3e434
Simplify calculation method
2022-09-08 18:22:53 +09:00
Dean Herbert
d463bd2f3f
Merge pull request #20130 from Exanc/master
...
Display 0 stars instead of infinity for the minimum star slider
2022-09-08 17:51:32 +09:00
Dean Herbert
c6521e4c72
Rename ordering helper method
2022-09-08 17:50:27 +09:00
Dan Balasescu
76eae73fa4
Revert unintended change
2022-09-08 17:41:23 +09:00
Dan Balasescu
c61c596c1f
Expose as readonly IAggregateAudioAdjustment
2022-09-08 17:37:02 +09:00
Dan Balasescu
b559d4ecdf
Rename GameplayAdjustments -> AdjustmentsFromMods
2022-09-08 17:14:06 +09:00
Dean Herbert
ed81297611
Fix playlist items showing download button briefly during initial local presence checks
2022-09-08 17:10:45 +09:00
Dan Balasescu
b0b4da533a
Expose gameplay adjustments via MultiSpectatorPlayer instead
2022-09-08 16:59:20 +09:00
Dean Herbert
d523a2ac33
Rename default value field and make private
2022-09-08 15:53:08 +09:00
Dean Herbert
9ead5e59d3
Fix incorrectly displaying minimum value in placeholder messaging
2022-09-08 15:51:15 +09:00
Salman Ahmed
50923b6e5b
Move track assignment below
2022-09-08 00:25:55 +03:00
Acid Chicken (硫酸鶏)
267465df18
chore(osu.Game): combine Osu.Colour.{Draw,Text}ForHitResult into OsuColour.ForHitResult
2022-09-07 23:34:46 +09:00
Acid Chicken (硫酸鶏)
b560b6f745
refactor(osu.Game): arrange the code for the timing distribution graph
2022-09-07 23:29:10 +09:00
Dan Balasescu
83c0cb1acc
Fix beatmap set to null after exiting song select
2022-09-07 21:34:29 +09:00
Dan Balasescu
fcea244537
Remove initial selection from OnlinePlaySongSelect
...
This stuff never really worked anyway - every case except with an
already created multiplayer room was broken anyway.
2022-09-07 21:34:29 +09:00
Dan Balasescu
208bd0f391
Give OnlinePlaySongSelect a reference PlaylistItem
2022-09-07 21:34:29 +09:00
Dean Herbert
6a03b4e0de
Merge branch 'master' into true-gameplay-rate
2022-09-07 20:01:03 +09:00
Dan Balasescu
cb9bae1f5c
Enable NRT
2022-09-07 19:54:55 +09:00
Dean Herbert
e6b449fe0b
Fix case of zero rate calculating a zero true gameplay rate
2022-09-07 19:23:44 +09:00
Dean Herbert
1be3b74ff3
Fix multiplayer spectator not getting gameplay adjustments applied
2022-09-07 19:12:34 +09:00
Dean Herbert
fa15502384
Move full track adjustment flow inside MasterGameplayClockContainer
2022-09-07 19:12:16 +09:00
Dean Herbert
75d0deef72
Apply proposed changes to remove inheritance from MasterGameplayClockContainer
2022-09-07 17:49:05 +09:00
Dean Herbert
99ef0c95fe
Simplify children assignment
2022-09-07 16:51:51 +09:00
Dean Herbert
f3bda4e040
Fix weird edge case of nullability in CarouselRoot
...
A bit unfortunately, but it's what we get for having ctor level bindings..
2022-09-07 14:27:25 +09:00
Dean Herbert
e18b524f8e
Fix missing null checks on selectedBeatmap fields in BeatmapCarousel
2022-09-07 14:12:35 +09:00
Dean Herbert
241d33d415
Apply NRT to BeatmapCarousel
2022-09-07 14:07:53 +09:00
Acid Chicken (硫酸鶏)
3003fc1061
refactor(osu.Game): improve code quality
2022-09-07 02:29:15 +09:00
Salman Ahmed
90207b6032
Merge branch 'master' into feature/EditorDeleteDiff
2022-09-06 18:48:06 +03:00
Dean Herbert
66c44f5913
Delegate interface to valid target
2022-09-06 22:26:46 +09:00
Dean Herbert
bc1212f4e6
Change NonGameplayAdjustments to GameplayAdjustments and convert TrueGameplayRate to extension method
2022-09-06 22:26:46 +09:00
Dean Herbert
db15bd56e8
Invalidate working beatmap cache when calling DeleteDifficultyImmediately rather than in editor code
2022-09-06 18:12:47 +09:00
Acid Chicken (硫酸鶏)
b109e5de6c
chore(osu.Game): align height of bars on timing distribution graph to basalHeight first and combine their transitions into each one
2022-09-06 00:04:10 +09:00
Dean Herbert
266eb758aa
Use new flow to calcaulate TrueGameplayRate
2022-09-05 23:37:49 +09:00
Dean Herbert
7084aeee05
Add method flow to reset applied adjustments
2022-09-05 23:22:38 +09:00
Dean Herbert
e33486a766
Implement IAdjustableAudioComponent in MasterGameplayClockContainer
2022-09-05 23:20:02 +09:00
Dan Balasescu
2923c10cd8
Rewrite rooms to store multiple active countdowns
...
Update test to the new structure
2022-09-05 19:03:26 +09:00
Dean Herbert
57954bb8f5
Enable nullability on TimelineHitObjectBlueprint
2022-09-05 14:50:43 +09:00
Mk-56spn
aace334fb3
Fix some test issues
2022-09-05 04:49:48 +02:00
Dan Balasescu
07d4a025b0
Merge pull request #20109 from frenzibyte/online-play-room-status-inconsistency
...
Fix room status dropdown placement inconsistent between multiplayer and playlists
2022-09-05 11:19:56 +09:00
Exanc
4ea7ca4c07
Slight tweak to the StarsSlider
...
- MinimumStarsSlider now shows "0" when at it's minimum
- Modified and NoResultsPlaceholder the tooltip to stay consistent with the changes
2022-09-05 00:09:20 +02:00
Acid Chicken (硫酸鶏)
7e77c9e8b4
chore(osu.Game): only the first result should be white at zero position on HitEventTimingDistributionGraph
2022-09-05 04:44:27 +09:00
Acid Chicken (硫酸鶏)
b67fd3d880
chore(osu.Game): split transform duration of bars on HitTimingDistributionGraph
2022-09-05 03:45:51 +09:00
Acid Chicken (硫酸鶏)
0af6b3dc0f
chore(osu.Game): colorize bars by OD on HitEventTimingDistributionGraph
2022-09-05 02:02:38 +09:00
Acid Chicken (硫酸鶏)
5f0832ead7
refactor(osu.Game): separate OsuColour.ForHitResult by usage
2022-09-05 01:58:57 +09:00
Mk-56spn
0c6d8efa28
Large code refactor, Implementation of shapes option drop down
2022-09-04 17:24:12 +02:00
Salman Ahmed
e8fa872f61
Fix room status dropdown position inconsistent on online-play screens
2022-09-03 16:14:21 +03:00
Mk-56spn
51061c3a12
Bug fixing and parameter adjustments
2022-09-03 01:27:22 +02:00
Mk-56spn
534c40e18e
Initial version
2022-09-02 23:07:30 +02:00
Dean Herbert
bc5340e33a
Merge branch 'master' into fix_progress_bar_info
2022-09-02 18:00:35 +09:00
Dean Herbert
4f18105e9d
Ensure next beatmap selected matches the menu ordering
2022-09-02 17:57:00 +09:00
Dean Herbert
840d1c4cd5
Disable delete difficulty menu item when only one difficulty is present
2022-09-02 17:14:48 +09:00
Dean Herbert
9fd8067e11
Tidy up dialog and deletion flow
2022-09-02 17:07:09 +09:00
Dean Herbert
605108c938
Refactor/rename deletion method to read better
2022-09-02 16:59:01 +09:00
Dean Herbert
b388428e1c
Merge branch 'master' into feature/EditorDeleteDiff
2022-09-02 16:48:38 +09:00
Dean Herbert
6a35b233e5
Merge branch 'master' into remove-dispose-updates
2022-09-01 23:03:19 +09:00
Dean Herbert
1524623624
Fix back-to-front filter logic
...
Was copied across from a place which was checking for `match` and
applied verbatim to a place that was `filter`. Which are polar
opposites.
2022-09-01 19:59:27 +09:00
HiddenNode
4a630b5384
Implemented SizePreservingSpriteText
2022-08-31 22:05:06 +01:00
Dan Balasescu
c852c54055
Consume auto skip setting during play
2022-08-31 20:24:15 +09:00
Dan Balasescu
b5ec7d06dd
Add auto-skip setting
...
Default to auto skip
2022-08-31 20:24:06 +09:00
Dan Balasescu
000412c50f
Merge pull request #20014 from peppy/fix-resume-skip-forward
...
Fix gameplay skipping forward during resume operation
2022-08-31 16:30:37 +09:00
Dan Balasescu
ccc08b816c
Merge pull request #20030 from peppy/notification-design-update
...
Update notification overlay design
2022-08-31 16:06:59 +09:00
Dean Herbert
7337d4c1aa
Merge branch 'master' into kps
2022-08-31 15:41:42 +09:00
Dan Balasescu
2bf74d2b38
Merge pull request #20039 from peppy/fix-skip-button-permanent-display
...
Fix skip button getting stuck on screen for certain beatmaps
2022-08-31 14:17:39 +09:00
Dean Herbert
cfc7c32aff
Merge pull request #20009 from frenzibyte/fix-back-to-front-comparison
...
Adjust weirdly back-to-front fallback comparison in `HitObjectOrderedSelectionContainer`
2022-08-31 14:14:10 +09:00
Dean Herbert
51346e0154
Fix skip button getting stuck on screen for certain beatmaps
...
Closes #20034 .
2022-08-31 13:22:51 +09:00
Dean Herbert
3d93e0ded1
Merge branch 'master' into fix-resume-skip-forward
2022-08-31 12:16:15 +09:00
Dean Herbert
09aa3e065d
Move colouring to full icon content rather than background
2022-08-30 18:06:48 +09:00
Dean Herbert
5d41fdfc89
Remove unnecessary usage of DrawableAudioMixer in ScorePanel
2022-08-30 15:05:21 +09:00
Dean Herbert
27ad224f13
Remove probably unnecessary Seek on start
2022-08-30 01:21:44 +09:00
Dean Herbert
1bff540381
Remove debug changes
2022-08-29 22:14:07 +09:00
Dan Balasescu
0491addbbd
Merge pull request #19974 from peppy/no-gameplay-clock-editor-offset
...
Fix editor not applying offsets
2022-08-29 21:10:29 +09:00
Dean Herbert
82b9e1f0eb
Merge pull request #20011 from smoogipoo/scoring-refactor
...
Refactor scoring to remove async methods / simplify
2022-08-29 19:55:27 +09:00
Dean Herbert
75531d2d62
Fix gameplay skipping forward during resume operation
2022-08-29 19:51:16 +09:00
Salman Ahmed
f2378d3fde
Merge branch 'master' into carousel-maintain-selection-over-update
2022-08-29 11:23:22 +03:00
Dean Herbert
2dafa041a7
Account for offset being applied to editor clock time in TestSceneEditorClock
2022-08-29 16:42:50 +09:00
Dean Herbert
105aa01e7d
Update usages of RemoveInternal
2022-08-29 15:57:40 +09:00
Dean Herbert
a215d009fe
Update Remove/RemoveRange/RemoveAll calls in line with framework changes
2022-08-29 15:57:40 +09:00
Dan Balasescu
423f6f90f2
Remove async calls from ScoreManager
2022-08-29 15:34:08 +09:00
Salman Ahmed
3ff2058975
Fix back-to-front fallback comparison in HitObjectOrderedSelectionContainer
2022-08-29 09:23:53 +03:00
Dan Balasescu
c0b13c7e1f
Refactor ScoreProcessor ComputeScore() methods
2022-08-29 13:51:10 +09:00
Dan Balasescu
cf6bb3b030
Merge pull request #19958 from peppy/fix-fail-freq-stuck
...
Ensure fail animation sequence isn't run after the player exit sequence has started
2022-08-27 00:58:41 +09:00
Dean Herbert
b9d9bf3004
Merge pull request #19938 from frenzibyte/fix-multi-spectator-results-screen
...
Fix multi-spectator potentially getting stuck for passed players
2022-08-26 21:53:17 +09:00
Salman Ahmed
a3e595a9aa
Update comment to include inserted indices
2022-08-26 14:51:19 +03:00
Salman Ahmed
81c0a641b4
Fix selection fallback path not updated to check inserted indices
2022-08-26 14:51:08 +03:00
Salman Ahmed
f38194fb40
Merge branch 'master' into carousel-maintain-selection-over-update
2022-08-26 14:35:19 +03:00
Dean Herbert
217fa00a72
Bring logic up-to-date
2022-08-26 19:32:49 +09:00
Dean Herbert
a146db0e35
Merge branch 'master' into carousel-perform-selection
2022-08-26 19:29:00 +09:00
Dean Herbert
cd90536e4b
Remove Track access in Timeline
2022-08-26 18:25:48 +09:00
Dean Herbert
12d6d6793c
Move EditorClock processing to Update and always decouple
2022-08-26 18:08:43 +09:00
Dean Herbert
31e459364b
Use FramedBeatmapClock in EditorClock
2022-08-26 17:28:58 +09:00
Dean Herbert
ed0843aa84
Reword xmldoc regarding final clock source to read better
2022-08-26 16:46:22 +09:00
Dean Herbert
2c780eab5f
Merge branch 'master' into fix_progress_bar_info
2022-08-26 16:14:21 +09:00
Dean Herbert
23efec6505
Fix naming and comment typos
2022-08-26 15:57:36 +09:00
Dean Herbert
9862b79b47
Fix typo in long comment
2022-08-26 15:20:09 +09:00
HiddenNode
d98357aa57
Made text inside SongProgressInfo scale.
2022-08-26 01:30:44 +01:00
Dean Herbert
a546aa2673
Clamp SpectatorPlayerClock's elapsed calculation to avoid player clocks getting too far ahead
2022-08-25 21:33:33 +09:00
Dean Herbert
3a17c6df08
Merge branch 'master' into no-gameplay-clock-gameplay-offset
2022-08-25 16:24:55 +09:00
Dean Herbert
a6ed589db4
Remove guard against RemoveFilters running more than once
...
It turns out this is required to remove some filters immediate, and some
later. Weird.
2022-08-25 14:47:33 +09:00
Dean Herbert
ad3dd1c700
Fix a couple of oversights regarding track nullability
2022-08-25 14:45:00 +09:00
Dean Herbert
ec60e16439
Apply NRT to FailAnimation
2022-08-25 14:35:42 +09:00
Dean Herbert
8f4a953d11
Ensure fail animation sequence isn't run after the player exit sequence has started
2022-08-25 14:26:42 +09:00
Dean Herbert
4c45f7d938
Ensure FailAnimation can't be Started after filters are already removed
2022-08-25 14:26:20 +09:00
Ryuki
5cddc7ed1f
Code cleanup (CPS)
2022-08-24 17:13:23 +02:00
Dean Herbert
f3847b90fd
Tidy up attach logic
2022-08-24 19:36:01 +09:00
Dean Herbert
5129716612
Merge branch 'master' into kps
2022-08-24 18:18:45 +09:00
Dean Herbert
2af8c4a2ea
Merge pull request #19904 from novialriptide/add-date-created-sort
...
Add date submitted sorting
2022-08-24 17:43:28 +09:00
Dean Herbert
27b57947e4
Rename PlayerArea.GameplayClock to SpectatorPlayerClock for clarity
2022-08-24 17:13:14 +09:00
Dean Herbert
5f01f461b3
Ensure elapsed time is always non-zero when advancing SpectatorPlayerClock
2022-08-24 17:13:14 +09:00
Dean Herbert
af56cd0126
Fix merge breakage
2022-08-24 16:52:36 +09:00
Dean Herbert
5079e0d83d
Merge branch 'master' into no-gameplay-clock-gameplay-offset
2022-08-24 16:52:10 +09:00
Salman Ahmed
e378c5b866
Remove no longer necessary switch case
2022-08-24 10:50:40 +03:00
Salman Ahmed
8f4a2b4936
Separate passed/failed states from calling EndGameplay
2022-08-24 10:36:13 +03:00
Andrew Hong
a8867d4245
Merge branch 'master' into add-date-created-sort
2022-08-24 03:23:27 -04:00
Dean Herbert
7f9246637a
Simplify MultiSpectatorScreen hierarchy construction
2022-08-24 16:08:48 +09:00
Dean Herbert
7c1fc4814e
Remove unused CreateMasterGameplayClockContainer method
2022-08-24 16:03:38 +09:00
Dean Herbert
871365bbb0
Inline ReadyToStart action binding for added safety
2022-08-24 16:03:38 +09:00
Dean Herbert
6c50f618a3
Don't use bindable flow for masterState
2022-08-24 16:03:38 +09:00
Dean Herbert
683d49c608
Move MasterClockState handling in to SpectatorSyncManager
2022-08-24 16:03:38 +09:00
Dean Herbert
d33d705684
Make WaitingOnFrames non-bindable
2022-08-24 16:03:38 +09:00
Dean Herbert
d05d8aeb22
Simplify interface implementations
2022-08-24 16:03:38 +09:00
Dean Herbert
2f5be6efca
Tidy up ProcessFrame and privatise const
2022-08-24 16:03:38 +09:00
Dean Herbert
b564c34dbc
Don't process master clock (is a noop)
2022-08-24 16:03:38 +09:00
Salman Ahmed
2fa8b61f3c
Handle completion user state updates during spectating
2022-08-24 10:02:21 +03:00
Dean Herbert
b4eede61fb
Use readonly instead of get-only
2022-08-24 15:28:18 +09:00
Dean Herbert
0b271fe4b3
Fix incorrect IsRunning value
2022-08-24 15:27:31 +09:00
Dean Herbert
b6254a1f25
Remove unnecessary casting
2022-08-24 15:23:31 +09:00
Dean Herbert
a86fc6f248
Change running state of SpectatorPlayerClock using IsRunning
2022-08-24 15:17:56 +09:00
Dean Herbert
0c9a4ec13c
Don't expose MasterClock in SpectatorClockSyncManager
2022-08-24 15:13:08 +09:00
Dean Herbert
995e6664b6
Rename spectator clock sync classes
2022-08-24 15:13:08 +09:00
Dean Herbert
31f657fe01
Remove ISpectatorPlayerClock interface
...
Too many levels of redirection.
One interface with one implementation is not useful, IMO.
2022-08-24 15:12:57 +09:00
Dean Herbert
882dd93942
Remove ISyncManager interface
...
Too many levels of redirection.
One interface with one implementation is not useful, IMO.
2022-08-24 15:12:57 +09:00
Dean Herbert
22963ab951
Fix multiplayer spectator getting stuck
2022-08-24 15:12:57 +09:00
Dean Herbert
ec31f37ff7
Accept MasterGameplayClockContainer rather than generic clock
2022-08-24 14:51:14 +09:00
Dean Herbert
85fbe7abca
Fix multiplayer spectator getting stuck
2022-08-24 13:11:53 +09:00
Andrew Hong
3cedd1cd1c
Merge branch 'master' into add-date-created-sort
2022-08-23 12:00:30 -04:00
Dean Herbert
29fed0c4a3
Avoid setting the source clock until gameplay is ready to start
...
Without this change, the audio track may audibly seek during load
proceedings.
2022-08-23 18:34:17 +09:00
Dean Herbert
ec61a94dc9
Merge branch 'master' into no-gameplay-clock-gameplay-offset
2022-08-23 17:36:06 +09:00
Dean Herbert
553897f2f0
Remove AddClock method to CreateManagedClock
2022-08-23 13:52:43 +09:00
Dean Herbert
1191b6c080
Remove unused Source_Set implementation on ISpectatorPlayerClock
2022-08-23 13:44:41 +09:00
Andrew Hong
55f1b43329
Removed check
2022-08-22 13:41:36 -04:00
HiddenNode
1098e24c40
Improved UprightUnscaledContainer
2022-08-22 14:24:52 +01:00
Dan Balasescu
c59298f0ce
Enable NRT
2022-08-22 21:55:04 +09:00
Dean Herbert
489e172a76
Simplify track start/stop/paused tracking
2022-08-22 19:43:18 +09:00
Dan Balasescu
5d3d8681d4
Invert creation of clocks in multi spectator
2022-08-22 19:14:06 +09:00
Andrew Hong
bcab7aea26
Merge branch 'master' into add-date-created-sort
2022-08-22 04:02:46 -04:00
Andrew Hong
c2036d3893
Moved filter exclusion
2022-08-22 03:39:46 -04:00
Andrew Hong
09ef13908c
Adjust to reviews
2022-08-22 03:20:27 -04:00
Dean Herbert
058d67f8e8
Merge pull request #19695 from naoei/ruleset-localization
...
Change most ruleset-accessible string types to Localisable strings
2022-08-22 16:13:23 +09:00
Dan Balasescu
0815b01b75
Merge pull request #19783 from bdach/mod-select/presets-dont-open-customisation
...
Fix selecting preset containing Difficulty Adjust automatically opening customisation panel
2022-08-22 15:44:00 +09:00
Dean Herbert
e6b669db8e
Elaborate with example of GameplayClockContainer managing its own Stop state
2022-08-22 14:14:44 +09:00
Dean Herbert
af2e82d7d5
Move operation of setting GameplayClockContainer.StartTime to Reset call
2022-08-22 14:11:06 +09:00
Andrew Hong
c6a739f5a8
Add date submitted sorting
2022-08-21 23:09:33 -04:00
Ryuki
5cf54a788a
Code cleanup for CPS counter
2022-08-21 16:00:58 +02:00
naoei
29ef1c8db8
Check if StatisticItem.Name is null or empty
2022-08-20 21:48:53 -04:00
naoei
9386d352b8
Make StatisticItem.Name not nullable
2022-08-20 21:48:35 -04:00
Nao
189a407cb1
Merge branch 'master' into ruleset-localization
2022-08-20 21:39:10 -04:00
Dean Herbert
8566e93c72
Guard against SubmittingPlayer potentially getting stuck waiting on request forever
2022-08-20 17:19:17 +09:00
Dean Herbert
da407aa827
Merge branch 'master' into kps
2022-08-20 15:24:58 +09:00
Dean Herbert
cbdd870ecf
Merge pull request #19693 from its5Q/editor-localisation
...
Add localisation support for beatmap editor setup
2022-08-20 11:51:57 +09:00
Dean Herbert
7bf318541c
Reword comment to hopefully read better
2022-08-19 20:57:55 +09:00
Dean Herbert
3f0da14065
Delay start operation by one frame to allow children to see initial start time
2022-08-19 17:39:51 +09:00
its5Q
4c24d8ed58
Improve string consistency
2022-08-19 03:17:05 +10:00
Dean Herbert
3eb1cda6aa
Reorganise call order of Start / Reset to make more sense
2022-08-19 01:46:36 +09:00
Ryuki
3de35a1518
Update calculator and tests to match changes on clocks
2022-08-18 18:40:02 +02:00
Dean Herbert
1d774f3f12
Remove redundant ProcessFrame calls
...
Of note, I'm not sure whether the `IsPaused` check was meaningful, but
it's not reimplemented in the new `FramedBeatmapClock`.
2022-08-19 01:39:02 +09:00
Dean Herbert
7bc96431a7
Remove unnecessary virtual spec from GameplayClockContainer.Seek
2022-08-19 01:39:01 +09:00
Dean Herbert
0e228791c0
Remove unnecessary Reset call in MultiSpectatorScreen
2022-08-19 01:39:01 +09:00
Dean Herbert
43879633db
Ensure setting a StartTime on a GameplayClockContainer always resets to the new time
2022-08-18 18:54:10 +09:00
Dean Herbert
343efa1d11
Split OffsetCorrectionClock out of MasterGameplayClockContainer
2022-08-18 18:54:10 +09:00
Dean Herbert
2c6fd1ec6e
Fix `GameplayClockContainer potentially resetting external seeks
2022-08-18 18:54:10 +09:00
Dean Herbert
6003afafc7
Use FramedBeatmapClock in GameplayClockContainer
2022-08-18 18:54:10 +09:00
Dean Herbert
9735728cf6
Reverse conditionals to better define intent in addSourceClockAdjustments
2022-08-18 15:08:09 +09:00
Bartłomiej Dach
d06959e1dd
Update incorrect xmldoc
2022-08-17 22:03:35 +02:00
Dean Herbert
e7ddbc41c8
Merge branch 'master' into no-gameplay-clock
2022-08-17 22:21:10 +09:00
Dan Balasescu
0cf3c5570a
Merge pull request #19800 from peppy/fix-editor-ear-rape
...
Fix slider ticks playing back at infinite rate while making changes to a slider in the editor
2022-08-17 15:50:58 +09:00
Dean Herbert
20256aad11
Merge branch 'master' into no-gameplay-clock
2022-08-17 15:21:20 +09:00
Dean Herbert
21b364cd77
Fix nullref in tests as initialBeatmap may be null
2022-08-17 14:48:00 +09:00
Dean Herbert
6b9dec5996
Restore original event flow to allow for OnSuspend case to work correctly
2022-08-17 14:32:21 +09:00
Dean Herbert
8ce50e98a6
Move delegate debounce logic to Editor itself
2022-08-17 14:04:57 +09:00
Dan Balasescu
8b5ac55fca
Remove newline
2022-08-17 13:48:06 +09:00
Dean Herbert
d9346abb9c
Tweak intro timings more and ensure non-theme tracks play from preview point
2022-08-17 13:20:40 +09:00
Dean Herbert
37799e3b31
Allow preparing preview point without looping
2022-08-17 13:20:24 +09:00
Bartłomiej Dach
1861f34427
Merge branch 'master' into editor-setup-no-state-change
2022-08-16 21:46:43 +02:00
Dan Balasescu
24fd411720
Merge pull request #19594 from BlauFx/improve_retry_behaviour
...
Skip song intro on quick restart
2022-08-16 20:18:12 +09:00
Dean Herbert
5ac314077a
Improve intro timings when not using osu! theme
...
Roughly as proposed in https://github.com/ppy/osu/discussions/19687 .
2022-08-16 18:19:30 +09:00
Dean Herbert
ee153a345c
Add a few more overlooked beatmap save states on setup screen modifications
2022-08-16 16:31:56 +09:00
Dean Herbert
5238a5c115
Merge branch 'master' into editor-setup-no-state-change
2022-08-16 16:28:29 +09:00
Dean Herbert
9d2c2b71cf
Change conditional to check for insertions in addition to modifications
...
It is possible that the import process itself marks the previous
beatmaps as deleted due to an overlap in metadata or otherwise.
2022-08-16 16:21:36 +09:00
Dean Herbert
c8fdfd298c
Merge branch 'master' into carousel-maintain-selection-over-update
2022-08-16 16:04:32 +09:00
Dean Herbert
ea50936d71
Fix slider ticks playing back at infinite rate while making changes to a slider in the editor
2022-08-16 15:27:58 +09:00
its5Q
e870ac6456
Fix code quality for CI
2022-08-16 15:51:54 +10:00
Dean Herbert
63819648df
Fix up flow of actual skip operation
2022-08-16 14:40:02 +09:00
Dean Herbert
9a1a7bae89
Make test actually test things
2022-08-16 14:40:02 +09:00
Dean Herbert
6761f869f9
Modify flow to avoid weird bindable and value resetting
2022-08-16 14:17:35 +09:00
