Dean Herbert
1a60e6d76e
Merge branch 'master' into health-animates-in-intro
2023-10-07 00:32:19 +09:00
Dean Herbert
8e5b2e78e5
Fix variable clash
2023-10-06 21:01:23 +09:00
Dean Herbert
d87ab9c82d
Adjust transition time based on miss/hit
2023-10-06 19:34:38 +09:00
Dean Herbert
3f2a00d90d
Add argon health display to default skin layout
2023-10-06 19:34:27 +09:00
Dean Herbert
f40e910c51
Remove left line from health display
2023-10-06 19:34:27 +09:00
Dean Herbert
db5178e453
Change ArgonHealthDisplay to be relative sized for now
2023-10-06 18:56:39 +09:00
Dean Herbert
936a21a661
Fix redundant bindable initialisation in SongSelect
2023-10-06 16:51:56 +09:00
Dean Herbert
1d7b8ea21a
Fix incorrect implementation of IHasCurrentValue in FooterButtonFreeMods
2023-10-06 16:51:40 +09:00
Dean Herbert
f2e56bbb65
Fix publicly-settable bindables
2023-10-06 16:51:24 +09:00
Dean Herbert
1005b7ac85
Fix incorrect test assumption in TestSceneEditorClock
...
I don't know what this test was trying to do, but it was wrong. Any
offset which is applied should be invisible to the clock's final
`CurrentTime` (and to the user).
2023-10-06 16:43:28 +09:00
Dean Herbert
354193c53a
Merge branch 'master' into clock-fix-attempt-2
2023-10-06 16:43:27 +09:00
Dean Herbert
61fd4186af
Ensure regenerateDisplay is eventually performed if originally called before load
2023-10-05 22:55:23 +09:00
Dean Herbert
76cc2f9f22
Fix WaveformComparisonDisplay potentially crashing on invalid track length
...
As seen at https://github.com/ppy/osu/runs/17415814918#r0s2 .
2023-10-05 14:58:55 +09:00
Bartłomiej Dach
bd71403309
Merge branch 'master' into health-animates-in-intro
2023-10-04 13:53:42 +02:00
Dean Herbert
5a17a86d1d
Merge branch 'master' into clock-fix-attempt-2
2023-10-04 16:57:49 +09:00
Marvin Schürz
6d97f89399
Rename OnlinePlayScreen.LoungeSubScreen to Lounge
2023-10-04 08:37:22 +02:00
Bartłomiej Dach
844a3b6c1b
Merge pull request #24980 from frenzibyte/gameplay-hud-redesign/health-display
...
Implement redesigned health bar display for "Argon" skin
2023-10-03 11:26:21 +02:00
Dean Herbert
4f3c433946
Move vertex related constants local to method
2023-10-03 17:41:52 +09:00
Dean Herbert
32b2ac4974
Rename and refactor glow/miss bars to hopefully make more sense
2023-10-03 17:41:11 +09:00
Dean Herbert
4f9daa1c14
Tidy up ArgonHealthDisplay code quality
2023-10-03 17:32:35 +09:00
Dean Herbert
8178cf3a8d
Tidy up background colour gradient logic
...
This changes things visually a touch, but I think it feels better.
And reads better.
2023-10-03 17:17:11 +09:00
Marvin Schürz
a171fa7649
Join multiplayer match when clicking the invite notification
2023-10-03 01:31:30 +02:00
Dean Herbert
82ba545358
Add initial animation for health bars
2023-10-02 17:01:58 +09:00
Dean Herbert
3a45bcad15
Improve flash and glow further
2023-10-02 02:11:07 +09:00
Dean Herbert
c4f47974bc
Improve glow further
2023-10-02 02:11:07 +09:00
Dean Herbert
88d608e1fa
Tidy up common animation code
2023-10-02 02:11:07 +09:00
Dean Herbert
df51e61234
Improve animation
2023-10-02 00:42:51 +09:00
Dean Herbert
22aa7ffd06
Use additive colour
2023-10-01 22:09:59 +09:00
Salman Ahmed
eef099e69d
Do not display "miss" bar if health is already zero
2023-10-01 15:25:34 +03:00
Salman Ahmed
7825bea959
Use interpolation for health bar opacity instead of transforms
2023-10-01 15:25:23 +03:00
Salman Ahmed
30d9004ef9
Fix small mistake
2023-10-01 13:41:11 +03:00
Salman Ahmed
446c9c2efe
Apply adjustments on the "miss" bar display
2023-10-01 13:39:36 +03:00
Salman Ahmed
9e2b8254d9
Add argon-specific health display test scene
2023-10-01 13:26:47 +03:00
Salman Ahmed
a331fb993a
Adjust health bar outer stroke colour
2023-10-01 01:21:37 +03:00
Salman Ahmed
319208ca3d
Adjust health bar glow intensity
2023-10-01 01:18:05 +03:00
Salman Ahmed
776536e816
Add "Argon" health display implementation
2023-10-01 00:56:16 +03:00
Salman Ahmed
33b0cb15a8
Add handling for miss judgements in HealthDisplay
2023-10-01 00:21:25 +03:00
Pasi4K5
c927f90a48
Replace regex with a custom algorithm and update test scene.
2023-09-29 13:46:33 +02:00
Pasi4K5
23c20ca5f4
Add xmldocs
2023-09-29 13:44:11 +02:00
Joseph Madamba
9e90374a90
Flash discard changes dialog popup when force quitting room/playlist creation with changes
2023-09-28 17:09:50 -07:00
Bartłomiej Dach
8215c4cb0e
Merge branch 'master' into mods-stable-ordering
2023-09-28 18:30:56 +02:00
Bartłomiej Dach
7638ea36a0
Merge branch 'master' into mod-icon-extended
2023-09-28 16:57:17 +02:00
Bartłomiej Dach
90326f62a7
Merge pull request #24953 from peppy/flash-dialog-on-stuck
...
Flash dialog popup when attempting to exit editor while exit is being blocked
2023-09-28 11:04:38 +02:00
Bartłomiej Dach
afa1815d13
Merge pull request #24929 from peppy/reduce-song-select-debounce
...
Reduce delay before loading beatmap after selection change at song select
2023-09-28 10:45:43 +02:00
Dean Herbert
7d74d84e6c
Display mod icons using stable ordering
...
In discussion with nanaya, we likely want this now that we're adding the
ability for some icons to be extended. Historically mod icons have been
displayed in a stable but arbitrary order (based on their position in
the `Mods` enum).
This change aims to make them stable across lazer scores (where they are
stored based on .. the order the user selected them).
2023-09-28 16:48:09 +09:00
Dean Herbert
7908b36b39
Flash dialog popup when attempting to exit editor while exit is being blocked
2023-09-28 15:25:39 +09:00
Dean Herbert
9f4df29880
Adjust fade durations at player loader to better hide mod jank
2023-09-27 19:29:03 +09:00
Dean Herbert
a639e51ddb
Fix value not updating after missing beatmap is imported
2023-09-27 18:17:25 +09:00
Dean Herbert
175cf68bd6
Avoid re-fetching WorkingBeatmap
2023-09-27 18:13:07 +09:00
Dean Herbert
ae31a8fadf
Reduce delay before loading beatmap after selection change at song select
...
This was originally set high because of performance concerns. We have
since improved things quite drastically. Even with a very low debounce
my song select is amazingly smooth.
This is about as low as we can got unless we want chaos when key
repeating left/right arrows (it's not as bad as you think, maybe worth
testing during review and see if it feels more expected?).
Of note, stable has key repeat disabled on left/right arrows and zero
debounce.
Addresses concerns in https://github.com/ppy/osu/discussions/24916 .
2023-09-26 16:21:09 +09:00
Fabian van Oeffelt
2040dcabe0
Improve Code Quality
2023-09-25 17:51:39 +02:00
Fabian van Oeffelt
2a3391d83b
Remove unused namepace
2023-09-25 16:56:34 +02:00
Fabian van Oeffelt
59d3143645
Fix SR/BPM Display in Playlist rooms
2023-09-25 16:53:40 +02:00
Pasi4K5
74896fd6b2
Fix multiple difficulty search queries not working in some cases.
2023-09-25 13:38:47 +02:00
Pasi4K5
793d1bf970
Add ability to search for difficulty names
2023-09-25 12:52:49 +02:00
Dean Herbert
d019cb5167
Update in line with framed clock changes
2023-09-22 22:02:18 +09:00
Dean Herbert
251a85db43
Fix StopUsingBeatmapClock not transferring time and running state
2023-09-22 16:22:36 +09:00
Dean Herbert
faa0481fc6
Fix editor operating directly on track rather than decoupled clock
2023-09-22 16:22:36 +09:00
Dean Herbert
8367bb6bee
Don't apply decoupling to SpectatorPlayerClocks
...
See inline comment for reasoning. It's a bit complicated.
2023-09-22 16:22:35 +09:00
Dean Herbert
bf08fbe196
Set source directly in FramedBeatmapClock ctor
...
This isn't required, but avoids creating a temporary `StopwatchClock`
and generally just makes debug easier with less state changes.
2023-09-22 16:22:35 +09:00
Dean Herbert
586311d508
Fix souce clock not always being transferred to FramedBeatmapClock in time
2023-09-22 16:22:35 +09:00
Dean Herbert
a1e298930c
Remove second hopefully-unnecessary workaround
2023-09-22 14:41:07 +09:00
Dean Herbert
df08c4e1ad
Disable decoupling for OsuGameBase's beatmap implementation
...
This avoids it ever mutating the underlying track (aka attempting to start
it). Resolves the one caveat mentioned in
aeef92fa710648d4a00edc523e13c17ac6104125.
2023-09-22 12:49:25 +09:00
Dean Herbert
117cd74af6
Update usage of DecoupleableInterpolatingFramedClock in FramedBeatmapClock
2023-09-22 12:49:25 +09:00
Dean Herbert
3f27be1f33
Replace most usages of DecoupleableInterpolatingFramedClock
...
Except `FramedBeatmapClock`, which is the high-effort one.
2023-09-22 12:49:25 +09:00
Dean Herbert
600651795b
Change FramedBeatmapClock to always be decoupled
2023-09-22 12:49:25 +09:00
Salman Ahmed
5266cdc722
Add explanatory note
2023-09-21 20:41:10 +03:00
Salman Ahmed
095812c6b8
Merge branch 'master' into fix-song-select-shift-delete
2023-09-21 20:25:43 +03:00
Salman Ahmed
9e4a56d64e
Merge branch 'master' into update-framework
2023-09-21 19:49:20 +03:00
Dean Herbert
9af4e75dfc
Disable clipboard export for song select textbox
...
In combination with https://github.com/ppy/osu-framework/pull/5997 ,
closes https://github.com/ppy/osu/issues/24867
2023-09-22 01:24:29 +09:00
Bartłomiej Dach
69ed99dfd5
Merge branch 'master' into mania-edit-disable-sv
2023-09-21 09:13:27 +02:00
Dean Herbert
bf984388b3
Update clocks in line with framework changes
2023-09-20 21:17:08 +09:00
Dean Herbert
c5397bdbb3
Merge branch 'master' into mania-edit-disable-sv
2023-09-20 14:23:07 +09:00
Dean Herbert
71ac5cfc79
Don't bother binding to friends changes for score display purposes
2023-09-20 14:14:37 +09:00
Dean Herbert
1927b524db
Merge branch 'master' into leaderboard-friend-highlight
2023-09-20 14:14:08 +09:00
Bartłomiej Dach
3bddf4bf9a
Rename spectator-specific settings to more generic (with backwards migration)
2023-09-18 14:56:06 +02:00
Bartłomiej Dach
9b391cd661
Merge branch 'master' into import-task-improve
2023-09-14 19:37:01 +02:00
Dean Herbert
541cd972e1
Rename ArchiveReader implementations to read better
2023-09-14 13:36:07 +09:00
Dan Balasescu
753c1c877c
Revert masking SSBO changes
2023-09-13 23:10:13 +09:00
Bartłomiej Dach
589f56d20c
Merge branch 'master' into map_info_on_mod_settings
2023-09-11 09:55:54 +02:00
Bartłomiej Dach
76bf82d900
Do not show mod effects on free mod select
2023-09-11 09:55:45 +02:00
Givikap120
ed213dad6c
minor format fix (again)
2023-09-08 20:38:24 +03:00
Givikap120
a01537c763
minor format fix
2023-09-08 20:37:07 +03:00
Givikap120
02e2b8546c
fixed all stated problems
2023-09-08 20:32:55 +03:00
Joseph Madamba
d0780fb765
Add comment explaining the max width
2023-09-06 15:01:55 -07:00
Joseph Madamba
97bd90c0ff
Link new song select wedge title and artist to search text box
2023-09-06 14:41:10 -07:00
cdwcgt
68752f95e5
color friend score to pink
2023-09-06 22:58:03 +09:00
Dean Herbert
1a37543d28
Rename SliderVelocity to SliderVelocityMultiplier to distinguish from Velocity
2023-09-06 19:01:08 +09:00
Bartłomiej Dach
b5e812eb3e
Merge pull request #24723 from bdach/beatmap-carousel-split-missing-status
...
Fix status on carousel beatmap set not showing in split difficulty mode
2023-09-06 09:35:38 +02:00
Bartłomiej Dach
63e92f8fab
Fix status on carousel beatmap set not showing in split difficulty mode
2023-09-06 08:25:19 +02:00
Dean Herbert
dded7fe6ca
Merge branch 'master' into beatmap-options-popover
2023-09-06 15:16:34 +09:00
Joseph Madamba
73604d171a
Make "general" a common string
2023-09-05 23:00:07 -07:00
Joseph Madamba
701e24e8d3
Move hide button to end and make it work
2023-09-05 18:50:31 -07:00
Joseph Madamba
6d2e57b73e
Add localisation support to beatmap options popover
2023-09-05 18:43:42 -07:00
Joseph Madamba
69fa8747f0
Explicitly add beatmapinfo param to edit call
2023-09-05 18:35:35 -07:00
Joseph Madamba
9565039192
Hide beatmap options popover when beatmap changes
2023-09-05 18:24:54 -07:00
Joseph Madamba
9f10082ffc
Revert param removal of delete beatmap and clear scores methods
2023-09-05 18:24:53 -07:00
Joseph Madamba
8e8fae0fba
Fix left padding adding shear width
2023-09-05 15:21:23 -07:00
Joseph Madamba
3f92dae55c
Move star rating display and status pill out of reloadable content
2023-09-05 15:20:20 -07:00
Joseph Madamba
676240928e
Move actual star updating to star rating display
2023-09-05 14:57:55 -07:00
Joseph Madamba
5becac6431
Make beatmap non-nullable
...
Doesn't seem like it'll be null after first set: 5454d1caa1/osu.Game/OsuGameBase.cs (L363)
2023-09-05 14:43:43 -07:00
Joseph Madamba
b63c1e4257
Remove mods dependency
...
BPM is not in the wedge anymore.
2023-09-05 12:14:17 -07:00
Joseph Madamba
6e6dd86a51
Remove buffered container comment
...
While it is true that there is a transparency overlap, it is only seen when entering/exiting song select. And there are other components game-wide that exhibit the same issue when transparency changes. Should be reconsidered another time.
2023-09-05 11:10:06 -07:00
Dean Herbert
4cd4eb3b0a
Move "general" to top for key binding compatibility
2023-09-05 16:46:49 +09:00
Dean Herbert
84d8d33ad7
Add headers and generally improve the UI of the popover
2023-09-05 16:44:55 +09:00
Dean Herbert
4ff3630484
Add a slight delay before hiding the popover to better visualise button click
2023-09-05 16:14:01 +09:00
Dean Herbert
a8c9c2bf17
Remove buffered container (doesn't seem like it's doing anything anymore)
2023-09-05 15:59:00 +09:00
Joseph Madamba
98d027d207
Fix star counter animating weird and delayed
2023-09-04 21:39:41 -07:00
Joseph Madamba
9accd0ded2
Fix star rating rolling counter regression
2023-09-04 21:21:56 -07:00
Joseph Madamba
82fb9dc2ef
Simplify text initialization
2023-09-04 12:59:21 -07:00
Joseph Madamba
e70510ef19
Move drawable and binding logic to standard places
2023-09-04 12:56:20 -07:00
Joseph Madamba
2df2002735
Move negative corner radius margin to constructor
2023-09-04 12:42:01 -07:00
Joseph Madamba
e8a793425b
Use right padding instead of negative x offset
2023-09-04 12:38:40 -07:00
Joseph Madamba
bf71099e57
Fix truncating sprite text usage
2023-09-04 12:04:20 -07:00
Joseph Madamba
2fbd67cf26
Merge branch 'master' into beatmap_wedge_clean_ii
2023-09-04 11:24:20 -07:00
Joseph Madamba
f616648730
Remove icon blending
2023-09-04 09:40:35 -07:00
Joseph Madamba
6c0bd13308
Add xmldoc to newly exposed methods
2023-09-04 00:53:14 -07:00
Joseph Madamba
5abf271b56
Implement beatmap options popover
2023-09-04 00:53:09 -07:00
Hồ Nguyên Minh
d5a89c4c45
Fix formatting
2023-09-04 13:32:42 +07:00
Hồ Nguyên Minh
b17a55d6a8
Add length check for slider velocity
2023-09-04 10:43:05 +07:00
Magnus-Cosmos
d674856e29
Use existing localisations in BeatmapInfoWedge
2023-09-02 22:49:29 -04:00
Givikap120
5e5fe84a88
Update AdvancedStats.cs
2023-09-03 02:19:02 +03:00
Givikap120
0779cd8f4f
minor design fixes
2023-09-03 02:17:04 +03:00
Givikap120
2e2d4d0d60
Merge branch 'map_info_on_mod_settings' of https://github.com/Givikap120/osu into map_info_on_mod_settings
2023-09-03 02:09:18 +03:00
Givikap120
b0398b6259
functionality is done
2023-09-03 02:09:01 +03:00
Bartłomiej Dach
76954f6e91
Merge branch 'master' into skin-editor-selection-negative-scaling
2023-09-01 21:30:24 +02:00
Wleter
fc4069f794
let SelectionBox perform flip with scale handles
2023-09-01 13:01:51 +02:00
Dean Herbert
0f5eff1230
Merge branch 'master' into mania-edit-disable-sv
2023-09-01 19:08:48 +09:00
Dean Herbert
96a5443813
Merge branch 'master' into carousel-difficulty-split
2023-08-30 14:24:30 +09:00
Dean Herbert
cbd4b91feb
Merge pull request #24678 from Nabile-Rahmani/bot-scores
...
Fix and use score user's IsBot property in results screen animation
2023-08-30 14:00:35 +09:00
Nabile Rahmani
b658b0e346
Fix and use score user's IsBot property in results screen animation
...
While a mod-created replay did flag itself as performed by a bot, the extension method converting it into a Score did not copy all the generated properties.
As noted, it might be preferable for ModCreatedUser to inherit APIUser and forward it as-is to the Score instance.
Related to PR #24675
2023-08-29 23:28:50 +02:00
Wleter
14ee0ee395
Merge branch 'ppy:master' into skin-editor-selection-negative-scaling
2023-08-29 17:30:55 +02:00
Wleter
d56ab0fe9a
change names
2023-08-29 17:25:52 +02:00
Givikap120
f8adc911cd
Merge branch 'ppy:master' into map_info_on_mod_settings
2023-08-28 23:17:04 +03:00
Givikap120
50235cc245
somewhat working prototype
2023-08-28 23:16:33 +03:00
Wleter
07e126241d
working negative scaling
2023-08-28 16:41:55 +02:00
Bartłomiej Dach
97d1c6e9fc
Merge branch 'master' into carousel-difficulty-split
2023-08-28 11:07:43 +02:00
Bartłomiej Dach
b9795eb3d4
Fix changes to beatmap sets being undone on switching sort mode
2023-08-28 11:02:22 +02:00
Bartłomiej Dach
80ec18d117
Fix incorrect selection restore code in split case
...
The fallback to "any of the added sets" needs to be applied after
they've all been added, rather than with every added one. Otherwise, in
flows that expect a particular difficulty to be selected in the end
(such as exiting from editor) would end up switching away from the
edited beatmap.
2023-08-28 10:06:26 +02:00
Bartłomiej Dach
0af6cc1394
Fix online ID not being propagated in split difficulty mode
...
Would result in failures to re-download the beatmap in update flows, for
instance.
2023-08-28 10:05:59 +02:00
Givikap120
8a1fc7c340
Basic stuff (not working for now)
2023-08-26 01:20:41 +03:00
Dean Herbert
10b1450138
Rename remove method to better explain return type being IEnumerable
2023-08-25 18:10:54 +09:00
Dean Herbert
89eeff515b
Reduce complexity of selection restore
2023-08-25 00:52:54 +09:00
Dean Herbert
9e94f38091
Fix typo in local variable
2023-08-24 18:33:15 +09:00
Dean Herbert
081fb308e1
Merge branch 'master' into new-overlay-sfx
2023-08-24 18:29:00 +09:00
Jamie Taylor
2e27a476bb
Re-enable sample playback for PasswordEntryPopover and remove sampleJoin playback instead
2023-08-24 18:04:47 +09:00
Dean Herbert
018be4c20f
Fix selection not being retained when switching between split mode
2023-08-22 18:49:02 +09:00
Dean Herbert
ecbf0f138e
Fix incorrect handling when new beatmaps arrive
2023-08-22 18:48:07 +09:00
Dean Herbert
2b1c6ae612
Ensure ID is maintained in temporary BeatmapSetInfos
2023-08-22 18:48:07 +09:00
Dean Herbert
290d18ad69
Split out difficulties in beatmap carousel in a bit of a hacky way
...
Seems like the simplest path forward for now, without a full rewrite.
2023-08-22 18:47:41 +09:00
