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

3427 Commits

Author SHA1 Message Date
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
1035b5fb19 Fix hold to pause button not working when HUD is hidden 2022-10-30 21:38:45 +09:00
Joseph Madamba
87328dd1f5 Fix bar hit error meter labels not clearing when setting to none 2022-10-27 23:59:01 -07:00
Dean Herbert
71970d83cf Remove obsoleted ShowProgressGraph global setting
This was moved to the component itself.
2022-10-28 12:47:45 +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
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
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
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
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
0f4a2a6059 Improve feel of settings toolbox group 2022-10-13 16:36:19 +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
Dean Herbert
19f3810020 Revert namespace change
Let's not
2022-10-12 18:50:47 +09:00
Dario Headley
b72c8970eb Max Combo Counter added 2022-10-12 09:50:01 +02:00
Dean Herbert
d2d589a156 Expose HUD state via Player 2022-10-12 15:11:52 +09:00
Dean Herbert
20adc522b9 Fix HUD components being interactive even when the HUD is visually hidden 2022-10-10 16:05:41 +09:00
Dan Balasescu
c18d4afdcc Merge branch 'master' into fix-leaderboard-first-place-fade 2022-10-07 19:55:16 +09:00
Dan Balasescu
57e4d6cc4a
Merge pull request #20562 from peppy/fix-score-submission-crash
Fix potential crash when score submission token retrival fails
2022-10-07 19:24:35 +09:00
Dean Herbert
276021dd85 Remove now unnecessary ScheduleAfterChildren 2022-10-05 14:20:01 +09:00
Dean Herbert
42aac16b37 Adjust leaderboard score panels sizing based on accuracy/combo width 2022-10-03 18:12:36 +09:00
Dean Herbert
65369e96eb Ensure token retrieval failure logic only runs once 2022-10-03 17:29:46 +09:00
Dean Herbert
c4dd23ed15 Log token retrieval failures even when gameplay is allowed to continue 2022-10-03 17:29:34 +09:00
Dean Herbert
4dbac917fc
Merge pull request #20547 from nanashi-1/solo-gameplay-leaderboard-max-combo
Display highest combo rather than current combo for local play on leaderboard
2022-10-03 16:57:05 +09:00
Salman Ahmed
a810afafb3 Reschedule results display delegate to avoid potential softlocks in the future 2022-10-02 15:37:56 +03:00
Salman Ahmed
59728b0ccb Fix results display delegate potentially cancelled while not exiting 2022-10-02 15:30:06 +03:00
nanashi-1
2493468800 display highest combo instead of current combo 2022-10-02 18:40:31 +08:00
Dean Herbert
cbbca616c1 Merge branch 'master' into fix-leaderboard-first-place-fade 2022-09-28 17:58:45 +09:00
Dean Herbert
cdcc8494c9 Fix fade being applied for too long when leaderboard scrolls to start 2022-09-28 16:10:19 +09:00
Dean Herbert
c8643ed265 Set ClampExtension to zero to stop jittering 2022-09-28 15:58:00 +09:00
Dean Herbert
8edb1cb98a Add test coverage of current score staying on screen 2022-09-28 15:57:50 +09:00
Dean Herbert
0296685c74 Start key counter / gameplay leaderboard hidden to avoid initial fade out 2022-09-27 17:25:24 +09:00
Dean Herbert
320f134634 Use same logic as KeyCounterDisplay 2022-09-27 15:01:18 +09:00
nanashi-1
5d18001d75 move config 2022-09-26 21:11:38 +08:00
nanashi-1
4295d9c169 revert 2022-09-26 21:11:14 +08:00
nanashi-1
ee4d1b2d58 add config visibility 2022-09-26 20:13:07 +08:00
Dean Herbert
20da1051d9 Apply NRT to GameplayLeaderboard hierarchy
Just some cleanup work that I wanted to do as part of my last changes.
2022-09-26 16:21:24 +09:00
o-dasher
feadac1f79 Cleanup all other leftover binding instantiation 2022-09-25 16:02:40 -04:00
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
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
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
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
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
HiddenNode
2dfa89c62e Clean up 2022-09-17 15:05:25 +01: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
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
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
81b5e4a865 Fix back-to-front condition on leaderboard always show configuration 2022-09-13 19:57:40 +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
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
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
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
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
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
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
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
Dean Herbert
e6b449fe0b Fix case of zero rate calculating a zero true gameplay rate 2022-09-07 19:23:44 +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
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
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
Mk-56spn
aace334fb3 Fix some test issues 2022-09-05 04:49:48 +02: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
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
6a35b233e5 Merge branch 'master' into remove-dispose-updates 2022-09-01 23:03:19 +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
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
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
09aa3e065d Move colouring to full icon content rather than background 2022-08-30 18:06:48 +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
Dean Herbert
75531d2d62 Fix gameplay skipping forward during resume operation 2022-08-29 19:51:16 +09:00
Dean Herbert
105aa01e7d Update usages of RemoveInternal 2022-08-29 15:57:40 +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
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
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
Salman Ahmed
8f4a2b4936 Separate passed/failed states from calling EndGameplay 2022-08-24 10:36:13 +03:00