1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 15:53:00 +08:00
Commit Graph

37868 Commits

Author SHA1 Message Date
Terochi
f58534f60c Extended the length of replay at the end of map 2023-02-05 18:51:28 +01:00
Joseph Madamba
cb8458cceb
Use linq and alpha instead
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-04 20:11:29 -08:00
Joseph Madamba
191259c050 Use equals instead and update other usage 2023-02-04 19:58:48 -08:00
Bartłomiej Dach
ef900bccdf
Merge branch 'master' into BPM_counter_fix 2023-02-04 23:44:58 +01:00
Bartłomiej Dach
cb7540564a
Merge pull request #22504 from peppy/fix-editor-positional-nudge-undo
Fix beatmap editor positional nudging not being undoable
2023-02-04 15:52:34 +01:00
Joseph Madamba
4192388b20 Fix expanded beatmap cards getting cut off at the end of profile sections 2023-02-03 21:29:01 -08:00
mk56-spn
88872cf1cf Use ``GetTrueGameplayRate()`` to remove need for jank 2023-02-04 00:53:54 +01:00
mk56-spn
d9bee958dd Stop ``BPMCounter.cs``'s value from going to 0 after failing. 2023-02-03 23:56:34 +01:00
Bartłomiej Dach
97afb83394
Merge branch 'master' into carousel 2023-02-03 22:15:44 +01:00
Bartłomiej Dach
63f7d326c2
Merge branch 'master' into fix-editor-positional-nudge-undo 2023-02-03 21:31:05 +01:00
Bartłomiej Dach
4bd43171e8
Merge branch 'master' into fix-skin-editor-padding-weirdness 2023-02-03 20:28:47 +01:00
Bartłomiej Dach
b2a5cf9f2d
Merge branch 'master' into triangles-old-texel 2023-02-03 19:43:34 +01:00
Bartłomiej Dach
59656a7286
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-03 19:08:33 +01:00
EXtremeExploit
f9809c9481
the comment 2023-02-03 11:48:11 -03:00
mk56-spn
e1af5e110a Remove ``RoundedNub.cs` and make `Nub.cs`` non abstract again 2023-02-03 12:19:09 +01:00
mk56-spn
8c11e8e6f4 Extract ShearedNub.cs implementation into its own entirely independent implementation 2023-02-03 11:58:10 +01:00
Joseph Madamba
461b5c5375 Fix comment cancel button not behaving the same as reply text toggle
- Removed the fading animation as it is awkward right now (needs resizing)
2023-02-03 02:04:19 -08:00
Dean Herbert
2cda277c09 Add a basic change handler to the skin editor 2023-02-03 18:57:50 +09:00
Dean Herbert
2f30306ea2 Expose a method to reload a SkinnableTargetContainer from provided info 2023-02-03 18:53:09 +09:00
Dean Herbert
3345e34544 Move beatmap specific logic out of EditorChangeHandler 2023-02-03 17:53:54 +09:00
Joseph Madamba
94d2799b90 Fix comments having too much padding at the bottom 2023-02-03 00:47:10 -08:00
Joseph Madamba
5a76c1ab9c Refactor HoverSampleDebounceComponent to inherit Component 2023-02-03 00:29:25 -08:00
Dean Herbert
b437501b0f Fix beatmap editor positional nudging not being undoable 2023-02-03 17:28:58 +09:00
Dean Herbert
554f14151c Apply NRT to EditorChangeHandler 2023-02-03 17:13:24 +09:00
Dean Herbert
b19047b90b Fix skin editor component list having uneven padding 2023-02-03 16:55:51 +09:00
Joseph Madamba
f27bf3ca20 Fix click sounds potentially not working 2023-02-02 23:54:57 -08:00
Joseph Madamba
77569058cb Alternatively fix hover sounds playing out of clicking bounds 2023-02-02 23:45:54 -08:00
Dean Herbert
60ccf35125 Update resources 2023-02-03 16:44:53 +09:00
Joseph Madamba
6135db6bd7 Revert moving hover sounds to content container 2023-02-02 23:43:08 -08:00
Dean Herbert
7b9239088b Comment space addition 2023-02-03 16:40:16 +09:00
Andrei Zavatski
14524237ac Add comment explaining texelSize value 2023-02-03 10:32:41 +03:00
Dean Herbert
4ec46c7476
Merge branch 'master' into footer_V2_implementation 2023-02-03 16:30:16 +09:00
Dean Herbert
48f7e0163c Adjust comments and formatting of comments 2023-02-03 16:27:20 +09:00
Dean Herbert
4248453616 Use FinishTransforms rather than manual duplication of background colour logic 2023-02-03 16:27:20 +09:00
Dean Herbert
a1200b8fe8 Adjust footer button colour handling to read better and take into account mouse down 2023-02-03 16:27:20 +09:00
Dean Herbert
92306b9123 Combine localisations for abstract skinnable components into a single file
Generally we don't want localisation files with only one to two
translations. It makes it harder for translators to handle in crowdin (a
lot of file changes for small results).

So for cases like this I believe we should be grouping translations
where it makes sense.

I've left individual components in their own files as I can see
potential for more settings to be added in the future. Plus it gives a
bit of extra context.
2023-02-03 16:02:18 +09:00
Dean Herbert
cf8cfe0d2c Move skin component localisations to namespaces 2023-02-03 15:34:57 +09:00
Dean Herbert
50559643bb Fix incorrectly applied enum localisation 2023-02-03 15:27:11 +09:00
Dean Herbert
32207dc9dd Merge branch 'master' into locale/skin-editor-components 2023-02-03 15:24:00 +09:00
Dean Herbert
5ca5f04794 Add parameter hint for optional bool value 2023-02-03 15:18:40 +09:00
Dean Herbert
9c954a93e3 Update Save method xmldoc to make more sense 2023-02-03 15:18:01 +09:00
Dean Herbert
f7094567d7 Rename and document method to limit scope 2023-02-03 15:04:47 +09:00
Bartłomiej Dach
1af898160c
Merge branch 'master' into delete-on-import-android 2023-02-02 21:40:52 +01:00
Bartłomiej Dach
e937022b09
Merge branch 'master' into middle-click-replay-pause 2023-02-02 20:52:03 +01:00
Bartłomiej Dach
4d46a8f32d
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-02 19:36:23 +01:00
Bartłomiej Dach
f7fa9e3927
Remove outdated comment 2023-02-02 18:41:35 +01:00
mk56-spn
80fd1a0bc7 Remove leftover comment regarding X axis offsets 2023-02-02 18:29:12 +01:00
Bartłomiej Dach
779c58f9c1
Merge branch 'master' into skin-editor-ux-impovements 2023-02-02 18:16:18 +01:00
Bartłomiej Dach
6c0aada86a
Merge pull request #22490 from peppy/skin-overlay-namespace
Move skin editor to overlays namespace
2023-02-02 18:14:16 +01:00
mk56-spn
3f0ce75bf5 Rename NormalSliderBar.cs to RoundedSliderBar.cs 2023-02-02 17:24:45 +01:00
mk56-spn
7c5a65bdb7 Rename NormalNub.cs to RoundedNub.cs 2023-02-02 17:23:09 +01:00
Dean Herbert
015f4f2b38 Avoid showing skin save message when changing scenes after making no changes 2023-02-02 18:42:37 +09:00
Dean Herbert
9b6d95b3d6 Adjust skin editor pop in/out to be more snappy 2023-02-02 18:33:45 +09:00
Dean Herbert
26efb8e842 Replace white box legacy placeholder with something that visually fits 2023-02-02 18:33:31 +09:00
tsrk
843d9914c4
quality: remove new line 2023-02-02 08:18:56 +00:00
Dean Herbert
659b78058f Move replay specific key bindings to their own section 2023-02-02 15:25:52 +09:00
Dean Herbert
edecd2ee25 Merge branch 'master' into middle-click-replay-pause 2023-02-02 15:25:51 +09:00
Dean Herbert
b792dc3af0
Merge pull request #22281 from cdwcgt/editor-check-previewtime
Add preview time setting check
2023-02-02 15:10:06 +09:00
Dean Herbert
48ef25cbe5
Merge pull request #22421 from EXtremeExploit/misses-animation
Add movement to legacy misses in osu ruleset
2023-02-02 15:00:57 +09:00
Dean Herbert
91fbf388da Use localisation strings from ButtonSystem for better consistency 2023-02-02 15:00:24 +09:00
Dean Herbert
500e9c7944 Refactor into a method rather than property 2023-02-02 14:53:58 +09:00
Dean Herbert
942e7729f3 Merge branch 'master' into carousel 2023-02-02 14:41:55 +09:00
Dean Herbert
5b3d7a8f26 Fix typo in missing-preview-point message 2023-02-02 14:34:59 +09:00
Andrei Zavatski
175b9fc5c9 Specify texelSize value in the Triangles background 2023-02-02 08:34:38 +03:00
Dean Herbert
c2cde8361a Fix message not reading well 2023-02-02 14:33:41 +09:00
Dean Herbert
3a861fd943 Remove multiple cases of excess braces 2023-02-02 14:28:21 +09:00
Dean Herbert
50659f3d52
Merge pull request #22428 from EVAST9919/triangles-new-masking
Implement Masking property for `TrianglesV2` background
2023-02-02 14:22:16 +09:00
Dean Herbert
229fb518dc Apply NRT to LegacyJudgementPieceOld 2023-02-02 14:19:00 +09:00
Dean Herbert
183d1c5bd6 Change version comparison to match other existing code as proposed in review 2023-02-02 14:18:49 +09:00
Dean Herbert
263a7e2766 Merge branch 'master' into misses-animation 2023-02-02 14:08:15 +09:00
Dean Herbert
8dc2e6872e Move skin editor to overlays namespace 2023-02-02 14:00:31 +09:00
Dean Herbert
10df64467a
Merge pull request #22430 from peppy/skin-editor-nrt
Apply NRT to all skin editor classes
2023-02-02 13:57:57 +09:00
tsrk
0fb6a63709
refactor: change namespacing to allow osu-localisation-analyzer to process all strings 2023-02-02 00:46:14 +00:00
Ruki
89a30d87c7
Merge branch 'ppy:master' into locale/skin-editor-components 2023-02-02 00:02:14 +00:00
tsrk
ddfa95e6ef
refactor: fix typos 2023-02-02 00:01:48 +00:00
tsrk
8645e705fd
feat: add localisation for Skin editor components 2023-02-01 23:48:05 +00:00
Bartłomiej Dach
292016d31e
Merge pull request #22483 from peppy/test-output-gameplay-time
Output gameplay clock progress in `PlayerTestScene`s
2023-02-01 22:55:10 +01:00
Dean Herbert
a77baf8717 Output gameplay clock progress in PlayerTestScenes 2023-02-01 23:42:44 +09:00
Dean Herbert
d54db8de64
Merge branch 'master' into fix-clicking-metadata-relevance-sort 2023-02-01 19:39:13 +09:00
Dean Herbert
524aa9162d Store search parameters as tuple 2023-02-01 19:38:47 +09:00
cdwcgt
76296eb35a Consistent with BeatmapsetVerifier 2023-02-01 11:52:14 +08:00
Joseph Madamba
1a152452f1 Fix incorrect naming of badge header container 2023-01-31 15:16:29 -08:00
Joseph Madamba
0366a8e348 Only call Reset() if lastCategory and lastHasQuery is null 2023-01-31 12:44:44 -08:00
Dean Herbert
7d1b5751fd
Merge pull request #22467 from Cootz/issue#22345
Fix migration putting game files in root of disk if no other files exist
2023-01-31 18:41:34 +09:00
Dean Herbert
5d22f3d879 Improve inline comment 2023-01-31 17:17:21 +09:00
Dean Herbert
3d8b35184f Update framework 2023-01-31 16:24:06 +09:00
Cootz
b18652b25f CreateSubDirectory removed. Fixes the empty root issue 2023-01-31 10:14:21 +03:00
Cootz
54d5d4e7c6 Fix for the issue 2023-01-31 07:06:26 +03:00
Bartłomiej Dach
b1cbe20cd8
Adjust markdown text flow to framework-side changes 2023-01-30 20:48:52 +01:00
Bartłomiej Dach
c5e1f54185
Fix sample store creation mutating shared resource store 2023-01-30 20:48:52 +01:00
Ruki
96bd79a6f5
Merge branch 'ppy:master' into hud/avatar-thing 2023-01-30 15:43:29 +01:00
mk56-spn
f5d579144b Remove free mods button 2023-01-30 12:57:24 +01:00
mk56-spn
41f5e5143a Remove ``onclick` and `mousedown`` override 2023-01-30 12:56:39 +01:00
Joseph Madamba
610d2f9dc7 Fix beatmap listing potentially not sorting by relevance when searching via metadata 2023-01-28 12:14:35 -08:00
Bartłomiej Dach
d38316bf4f
Merge pull request #22429 from peppy/fix-health-display-anchor-point
Fix default health bar having a very weird anchor point in the skin editor
2023-01-28 10:33:59 +01:00
ekrctb
27578c48f5 Remove JudgementResultEntry
It is not needed anymore as TimeAbsolute is stored raw.
2023-01-27 19:35:44 +09:00
Dean Herbert
98c9ba5b6f
Merge branch 'master' into skin-editor-nrt 2023-01-27 19:35:43 +09:00
Dean Herbert
74ab036f3e Refactor SkinnableSound.Samples to be non-nullable 2023-01-27 19:32:30 +09:00
Dean Herbert
8a9a6c733c
Apply missed cleanup to BackgroundDependencyLoader call
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-27 13:55:34 +09:00
Bartłomiej Dach
9bdd43d1b2
Merge pull request #22406 from peppy/fix-storyboard-filename
Fix beatmaps with multiple `osb` files potentially reading the storyboard from the wrong one
2023-01-26 20:32:16 +01:00
mk56-spn
091cc155d3 Fix nub naming in OsuCheckbox.cs and associated classes 2023-01-26 16:10:02 +01:00
EXtremeExploit
1de0bed83d
fix comment 2023-01-26 11:09:16 -03:00
mk56-spn
a630f1113f Rename nub object in NormalSliderBar.cs class 2023-01-26 15:03:51 +01:00
mk56-spn
8840694674 Adjust some padding details on ShearedSliderBar.cs as well as colouration tweaks. 2023-01-26 15:03:51 +01:00
mk56-spn
2f90ffccfc Implement ShearedSliderBar.cs and corresponding TestSceneShearedSliderBar.cs 2023-01-26 15:03:22 +01:00
mk56-spn
6dfb9630d6 Implement ShearedNub.cs as well as tweak the syntax in NormalNub.cs 2023-01-26 15:03:22 +01:00
mk56-spn
b8ae689b31 Re-add Nub.cs and move logic from NormalNub.cs to it. 2023-01-26 15:03:22 +01:00
mk56-spn
63efe79abc Enable NRT for NormalNub.cs 2023-01-26 15:03:22 +01:00
mk56-spn
374c3b56f6 Rename Nub.cs to NormalNub.cs 2023-01-26 15:03:11 +01:00
EXtremeExploit
758b4c8cfc
Do the thing aka fix the if 2023-01-26 10:01:33 -03:00
mk56-spn
7355397e83 Enable NRT on NormalSliderBar.cs 2023-01-26 12:58:58 +01:00
mk56-spn
fc99165df7 Extract samples into base OsuSliderBar.cs from NormalSliderBar.cs 2023-01-26 12:36:05 +01:00
mk56-spn
9afc8681ef Extract tooltip implementation into base OsuSliderBar.cs from NormalSliderBar.cs 2023-01-26 12:25:05 +01:00
mk56-spn
ac3ad9cf8d Implement OsuSliderBar.cs as base ( non framework side ) class from which NormalSliderBar.cs inherits 2023-01-26 12:16:51 +01:00
mk56-spn
3988131475 Rename OsuSliderBar.cs as NormalSliderBar.cs 2023-01-26 12:12:56 +01:00
Dean Herbert
4352c56c3e Apply NRT to all simple auxiliary skin classes 2023-01-26 17:53:04 +09:00
Dean Herbert
2017ac1135 Apply NRT to all skin editor classes 2023-01-26 17:52:53 +09:00
Dean Herbert
e5d4979bc3 Fix default health bar having a very weird anchor point in the skin editor 2023-01-26 16:56:37 +09:00
Dean Herbert
64e7f6f138 Add more documentation around the implementation of FontAdjustableSkinComponent 2023-01-26 16:05:07 +09:00
Dean Herbert
d63719a602 Move and rename the base component class 2023-01-26 16:04:56 +09:00
Dean Herbert
48885d40cc
Merge branch 'master' into skin-fonts 2023-01-26 15:52:54 +09:00
Andrei Zavatski
7cd21e12f3 Implement masking property for TrianglesV2 background 2023-01-26 09:46:41 +03:00
Dean Herbert
f3c92749bf Fix code quality issues 2023-01-26 15:43:03 +09:00
Dean Herbert
7cc4fd4efc Use the exact method stable uses for generating storyboard filenames 2023-01-26 15:09:36 +09:00
Dean Herbert
044234b1ba
Merge pull request #22409 from EVAST9919/triangles-og-masking
Implement Masking property for `Triangles` background
2023-01-26 14:46:59 +09:00
EXtremeExploit
bcecc49092
Only do misses animations on modern skins 2023-01-25 23:05:11 -03:00
EXtremeExploit
a6fc3ce477
bring comment back 2023-01-25 20:38:55 -03:00
Dan Balasescu
5f4dd19b49
Merge pull request #22389 from peppy/mania-long-note-wang
Add basic support for stupidly long hold note skin textures
2023-01-26 07:41:27 +09:00
Bartłomiej Dach
fd495e87f7
Fix GetAsync() not limiting texture dimensions 2023-01-25 19:02:35 +01:00
EXtremeExploit
fc968d1d89
del extra newline 2023-01-25 14:38:02 -03:00
EXtremeExploit
a4a94cb96e
Add movement to misses in osu ruleset 2023-01-25 14:34:00 -03:00
EXtremeExploit
0eaebfd40a
Use Alpha instead of opacity on bg color 2023-01-25 10:22:42 -03:00
Andrei Zavatski
1485a6e006 Make masking false by default 2023-01-25 12:54:30 +03:00
Andrei Zavatski
d09d6f31d7 Implement Masking property for TrianglesBackground 2023-01-25 12:20:51 +03:00
Dean Herbert
f0406c34fd Merge branch 'master' into revert-result-in-playfield 2023-01-25 17:35:33 +09:00
Dean Herbert
efe57f29e0
Merge pull request #22382 from JDECOMBE/beatmapSelectionBlur
Add ability to disable background blur at song select
2023-01-25 17:34:35 +09:00
Dean Herbert
67e9de43be
Merge pull request #22386 from EVAST9919/triangles-og-shhader
Use `TriangleBorder` shader in `Triangles` background
2023-01-25 17:25:18 +09:00
Dean Herbert
d15f8c2f3a Fix beatmaps with multiple osb files potentially reading the storyboard from the wrong one
In stable, the storyboard filename is fixed. In lazer, we were always
looking for the first `.osb` in the database. In the case a beatmap
archive housed more than one `.osb` files, this may load the incorrect
one.

Using `GetDisplayString` here feels like it could potentially go wrong
in the future, so I'm open to hard-coding this locally (or using string
manipulation to remove the ` [creator_name]` portion of the beatmap's
filename). Open to opinions on that.

Fixes storyboard playback in https://osu.ppy.sh/beatmapsets/1913687#osu/3947758
2023-01-25 17:11:15 +09:00
Dean Herbert
5c888e0c68
Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:37:19 +09:00
Dean Herbert
59ee6922b1
Merge pull request #22399 from bdach/user-profile/update-cover
Update appearance of profile cover area to match web
2023-01-25 16:35:44 +09:00
Dean Herbert
01e280eb6b Add classic default for song select blur setting 2023-01-25 16:32:00 +09:00
Dean Herbert
e333e12b2e Fix typo in settings enum (seriously) 2023-01-25 16:32:00 +09:00
Dean Herbert
3faab66f39 Merge branch 'master' into beatmapSelectionBlur 2023-01-25 16:32:00 +09:00
Dean Herbert
1a9ed1ac3f Remove unnecessary IgnoreUserSettings value change 2023-01-25 16:28:06 +09:00
Dean Herbert
f81dea4166 Remove now unused localisation string 2023-01-25 16:24:52 +09:00
Dean Herbert
7bb6337d2e Fix nullability (thanks bdach for patch) 2023-01-25 14:43:46 +09:00
Dean Herbert
8caf960f9a Revert weird nullable changes to Skin.cs 2023-01-25 14:43:46 +09:00
Dean Herbert
0a9b20d5d5 Split lookup store into own file / class 2023-01-25 14:43:46 +09:00
Dean Herbert
c1a5c16973 Reduce maximum texture size to a more commonly-supported 8192 2023-01-25 14:43:46 +09:00
Dean Herbert
d000a4ed28 Make sure to dispose of the original texture upload as we are replacing it 2023-01-25 14:43:46 +09:00
Dean Herbert
598c6fcbad Add basic support for stupidly long hold note skin textures 2023-01-25 14:43:46 +09:00
Dean Herbert
6bf7773532 Increase duration of expansion transition 2023-01-25 14:28:25 +09:00
Dean Herbert
3e91dd2a16 Update spacing along with expanded state 2023-01-25 14:28:25 +09:00
Dean Herbert
6efab635d8
Merge branch 'master' into fix-copy-difficulty-moving-collections 2023-01-25 14:11:32 +09:00
Dean Herbert
392ff2ffea Reword comment regarding hash transfer to make more sense 2023-01-25 14:11:02 +09:00
Dean Herbert
741ca96853 Make transferCollections argument to private method explicitly required 2023-01-25 14:09:13 +09:00
Dean Herbert
739ec8d81d
Add argument hint for nondescript bool
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-25 14:04:30 +09:00
Bartłomiej Dach
f2df36e6a5
Persist cover visibility to user settings
Follows web precedent, wherein the setting is saved to local storage.
2023-01-24 23:30:12 +01:00
Bartłomiej Dach
33e91cf512
Implement cover toggling 2023-01-24 23:06:49 +01:00
Bartłomiej Dach
e74176e5bd
Add cover toggle button 2023-01-24 23:06:46 +01:00
Bartłomiej Dach
ef7812412b
Update top header container appearance 2023-01-24 23:06:44 +01:00
Bartłomiej Dach
ff22a91d52
Move user cover lower down 2023-01-24 23:06:37 +01:00
Bartłomiej Dach
edb9c76edf
Merge pull request #22385 from peppy/touchscreen-settings-keyword
Fix touch input handler settings not matching search for "touchscreen"
2023-01-24 20:50:53 +01:00
Bartłomiej Dach
054938be02
Merge pull request #22387 from peppy/beatmap-leaderboard-cancel-request-eagerly
Fix beatmap leaderboard potentially showing incorrect leaderboard
2023-01-24 19:49:11 +01:00
Jérémiah DÉCOMBE
acb42f7d12 reusing gameplay background blur loc song select background blur 2023-01-24 10:18:00 +01:00
Dean Herbert
b9291cb116 Change some order and assert for positive visibility before scheduling an operation in changelog overlay 2023-01-24 17:59:25 +09:00
Jérémiah DÉCOMBE
e0a7559d85 variable naming + loc 2023-01-24 09:55:08 +01:00
Joseph Madamba
c6bf755e68 Remove IsPresent override from ChangelogOverlay 2023-01-24 00:22:29 -08:00
Joseph Madamba
df895c4fd6 Always make settings footer build display clickable 2023-01-24 00:21:39 -08:00
Jérémiah DÉCOMBE
7ca2a431e6 changing song select background blur setting to boolean 2023-01-24 09:19:53 +01:00
Jérémiah DÉCOMBE
d783998c81 using BindValueChanged and IsCurrentScreen for setting binding 2023-01-24 09:09:05 +01:00
Dean Herbert
a966d6c330
Merge pull request #18402 from ggliv/mod-accuracy-challenge
Add accuracy challenge mod
2023-01-24 16:00:55 +09:00
ekrctb
e1702a8ee9 Fix inspection issue 2023-01-24 15:43:57 +09:00
ekrctb
efef97d5be Store Result.TimeAbsolute separately from offset
Calculating from TimeOffset is bad because it loses precision.
The result time won't change anymore
even If `HitObject.GetEndTime()` changes later.
2023-01-24 15:35:06 +09:00
Gabe Livengood
b46ef67a14 increase min minimum accuracy to 60% 2023-01-24 00:31:46 -05:00
ekrctb
cc87923179 Fix OnRevertResult timing 2023-01-24 14:19:24 +09:00
ekrctb
e66e43e17c Remove unused code 2023-01-24 14:15:17 +09:00
Dean Herbert
bb15ee50e0 Fix beatmap leaderboard potentially showing incorrect leaderboard 2023-01-24 13:52:59 +09:00
Andrei Zavatski
04c96355cb Use TriangleBorder shader to draw triangles 2023-01-24 07:38:42 +03:00
Dean Herbert
fc558278cc Fix touch input handler settings not matching search for "touchscreen" 2023-01-24 13:37:12 +09:00
Pasi4K5
8b47af6503 Remove HidesResumeOverlay and set ResumeOverlay to null in OsuModAutopilot 2023-01-24 00:49:09 +01:00
Jeremiah DECOMBE
c1876aac88 removing parameter name abbreviations 2023-01-24 00:36:38 +01:00
Jeremiah DECOMBE
b573e42cc2 BeatmapSelectionBackgroundBlurLevel renamed to SongSelectBackgroundBlurLevel 2023-01-24 00:08:11 +01:00
naoey
e6de167adb
Revert split and make collections boolean internal to BeatmapManager 2023-01-24 07:27:26 +09:00
Jeremiah DECOMBE
26adc28943 missing blank line between methods 2023-01-23 23:15:37 +01:00
Jeremiah DECOMBE
f13a5465ba variable naming and loc modifications 2023-01-23 23:07:50 +01:00
Bartłomiej Dach
7483967157
Merge branch 'master' into SliderEnd-Snap 2023-01-23 21:33:16 +01:00
Bartłomiej Dach
1f40b2daf6
Clean up xmldocs 2023-01-23 21:22:18 +01:00
Bartłomiej Dach
9f2ed853eb
Merge pull request #22371 from peppy/more-settings-keywords
Add more keywords to settings based on feedback
2023-01-23 20:19:53 +01:00
Jérémiah DÉCOMBE
6daa364779 adding setting to adjust blur of the background of the song select screen 2023-01-23 13:53:31 +01:00
Dean Herbert
432e0a6a37
Merge branch 'master' into level-badge-colour 2023-01-23 15:46:15 +09:00
Dean Herbert
9c2494383f Rename fetch method to be non-plural to match all others 2023-01-23 15:43:52 +09:00
Dean Herbert
e3932c077b
Merge pull request #22032 from frenzibyte/fix-potential-difficulty-failure-alt
Fix advanced statistics display potentially performing invalid difficulty calculation
2023-01-23 15:39:47 +09:00
cdwcgt
5afb733fb2
change IssueTemplatePreviewTimeConflict's text 2023-01-23 15:26:28 +09:00
Dean Herbert
7ebd31d42f Add more keywords to settings based on feedback 2023-01-23 15:14:16 +09:00
Dean Herbert
2ed9fe3747 Add support for externally specified keywords in SettingsButtons 2023-01-23 15:10:26 +09:00
Dean Herbert
73f083a316 Refactor how additional points are provided to avoid confusion 2023-01-23 14:13:46 +09:00
Susko3
f8537c1cbe Delegate file deletion to ImportTask to allow overriding it 2023-01-22 22:19:04 +01:00
EXtremeExploit
8d4889d5ce
Cleanup 2023-01-22 17:42:53 -03:00
EXtremeExploit
e60a089f1a
Set alpha on container instead of children 2023-01-22 15:02:02 -03:00
EXtremeExploit
de5eb63ceb
Fix codefactor 2023-01-22 13:38:13 -03:00
EXtremeExploit
933fc8cc83
Fix comment 2023-01-22 13:33:36 -03:00
EXtremeExploit
64c9654910
Make probationary groups a bit transparent 2023-01-22 13:32:05 -03:00
Dean Herbert
f87bb589a2
Merge pull request #22340 from EXtremeExploit/groups-modes
Add modes text to groups tooltip
2023-01-23 01:10:25 +09:00
Bartłomiej Dach
e1acf85bb3
Merge branch 'master' into groups-modes 2023-01-22 10:09:34 +01:00
Bartłomiej Dach
9bde1ef9bf
Privatise setter 2023-01-22 10:09:08 +01:00
Bartłomiej Dach
b98da506c1
Fix code quality inspection 2023-01-22 10:07:47 +01:00
Bartłomiej Dach
31e7d7333b
Merge branch 'master' into fix-fail-sample-playing-after-leaving-dialog 2023-01-22 09:35:37 +01:00
Bartłomiej Dach
06aa3f7798
Rename Stop{SampleAndRemoveFilters -> }()
Now that just one method for stopping samples is left, let's just
repurpose st as the general "stop global effects" method rather than
have it there with a hyperspecific name. It also has good symmetry, as
there already was a `Start()` method in the class.
2023-01-22 09:29:22 +01:00
Bartłomiej Dach
9e4e85e3e3
Inline StopSample() into StopSampleAndRemoveFilters()
The first method no longer has any callers except for the second one.
2023-01-22 09:26:01 +01:00
Bartłomiej Dach
0edfd24410
Remove unnecessary sample stop in Restart()
It is unnecessary, as a successful restart will exit the current player
screen, and `OnExiting()` has another `StopSampleAndRemoveFilters()`
call, which means that in the restart flow the sample was actually
getting stopped twice.

Standard exit flow is fine, it only stopped the sample once.
2023-01-22 09:24:12 +01:00
Bartłomiej Dach
88d58e8476
Merge pull request #22337 from Joehuu/fix-comment-editor-sounds
Fix comment editor text boxes not having sound feedback
2023-01-22 09:10:20 +01:00
Bartłomiej Dach
b66279c5d7
Merge pull request #22341 from peppy/screen-scaling-keywords
Add search keywords for screen scaling sub-settings
2023-01-22 08:56:14 +01:00
Matheus Filipe dos Santos Reinert
db0b69db6b
Merge branch 'master' into fix-fail-sample-playing-after-leaving-dialog 2023-01-22 02:12:07 -03:00
Dean Herbert
7040743249 Add search keywords for screen scaling sub-settings 2023-01-22 13:47:31 +09:00
Matheus Filipe dos Santos Reinert
5b1a23c697 Replace RemoveFilters call with StopSampleAndRemoveFilters 2023-01-22 01:44:16 -03:00
Matheus Filipe dos Santos Reinert
2e1ba6ef49 Create StopSampleAndRemoveFilters method and change RemoveFilters to private 2023-01-22 01:43:40 -03:00
EXtremeExploit
2f3971b6fb
Move code to already existing if block 2023-01-22 01:40:00 -03:00
EXtremeExploit
8c208da324
Cleanup 2023-01-22 01:39:01 -03:00
EXtremeExploit
05f77d2cab
Add modes text to groups tooltip 2023-01-22 01:36:53 -03:00
Matheus Filipe dos Santos Reinert
a746cbc6ed Fix failSample still playing after player left FailOverlay 2023-01-22 01:14:33 -03:00
Pasi4K5
75a1a2ec2f Hide ResumeOverlay when OsuModAutopilot is enabled 2023-01-22 03:44:59 +01:00
Joseph Madamba
da03abc812 Fix comment editor text boxes not having sound feedback 2023-01-21 17:32:42 -08:00
naoey
1c1c9915bb
Split saving new and existing beatmaps into separate flows 2023-01-22 10:27:33 +09:00
Bartłomiej Dach
718cbf9382
Fix SegmentedGraph draw node calculating segment colours in unsafe manner
The `SegmentedGraph`'s draw node would call `getSegmentColour()`
on the drawable, which would query the `DrawColourInfo` and
`tierColours` properties of the drawable. This is a cross-thread access
and as such completely unsafe, as due to being cross-thread it can die
on invalidations or out-of-bounds accesses.

Fix by transferring everything to the draw node first before attempting
to draw. `SegmentedGraph.TierColours` setter already correctly
invalidates the draw node via `graphNeedsUpdate`, so no further
intervention was required there.

Closes #22326.
2023-01-21 23:19:34 +01:00
naoey
a1b5c9d910
Don't transfer MD5 hashes in collections when copying beatmaps
Fixes #22306.

Changes beatmap saving so that by default it does not transfer
the hashes in collections, and only transfers them when saving the same
difficulty in the editor.

Issue seems to have been introduced in https://github.com/ppy/osu/pull/20641.
2023-01-22 01:14:18 +09:00
Salman Ahmed
c48af79588 Fix test browsers on longer working after framework update 2023-01-21 14:49:47 +03:00
Dean Herbert
19450bfe12 Update framework 2023-01-20 23:23:25 +09:00
ekrctb
d8f9b7d02f Use MaximumJudgementOffset for lifetime 2023-01-19 21:25:21 +09:00
ekrctb
11e1b22bf5 Move MaximumJudgementOffset to HitObject
We want to access this property for computing lifetime
2023-01-19 21:23:55 +09:00
ekrctb
812a4b412a Move judgement result revert logic to Playfield
Previously, some judgement results were not reverted
when the source DHO is not alive (e.g. frames skipped in editor).
Now, all results are reverted in the exact reverse order.
2023-01-19 19:57:13 +09:00
Dean Herbert
2ce32e3209 Refactor update logic to be easier to follow 2023-01-19 19:27:05 +09:00
mk56-spn
b22363ed8c Fix JudgementCounterDisplay.cs max judgement always showing upon changing display mode 2023-01-19 10:31:02 +01:00
Dean Herbert
4916a742d5 Immediately focus the textbox when clicking to reply to a comment 2023-01-19 16:08:27 +09:00
Dean Herbert
81e6c3792c Remove unused method 2023-01-19 16:03:46 +09:00
Dean Herbert
56ce8504ae Merge branch 'master' into comment-reply 2023-01-19 16:01:47 +09:00
Dean Herbert
07af18b8a7 Remove ReplyCommentEditor into its own class 2023-01-19 16:01:37 +09:00
Dean Herbert
db8084570d
Merge pull request #22285 from bdach/segmented-graph-tint
Apply draw colour to segmented graph
2023-01-19 13:36:19 +09:00
Dean Herbert
e58abf7d1a
Merge pull request #22284 from bdach/judgement-counter-broken
Fix "show max judgement" setting not applying initially on judgement counter display
2023-01-19 09:09:06 +09:00
Bartłomiej Dach
a0fe71c706
Use alternative segment colour computation method 2023-01-19 00:08:32 +01:00
Bartłomiej Dach
b62ff8d644
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 23:52:12 +01:00
Bartłomiej Dach
b8b7442eb8
Make SongProgressInfo.ShowProgress init-only (and remove duplicate init) 2023-01-18 23:35:40 +01:00
Bartłomiej Dach
903c37bf32
Apply draw colour to segmented graph segments 2023-01-18 23:17:57 +01:00
Wleter
f8d8a627b8 change property name 2023-01-18 22:00:39 +01:00
Bartłomiej Dach
769f8c6190
Fix ShowMaxJudgement callback conflicting with JudgementCounter.Pop{In,Out}
Both `JudgementCounterDisplay` (via the `ShowMaxJudgement` callback)
and the `JudgementCounter.Pop{In,Out}` methods were operating on the
alpha of the `JudgementCounter`. This meant that if the counter display
was created with max judgement initially hidden, it would be hidden
by the `ShowMaxJudgement` callback first, but then _unhidden_
by `PopIn()`.
2023-01-18 21:46:28 +01:00
Wleter
40e99069fc fix typos and newlines 2023-01-18 21:43:09 +01:00
Wleter
ab78dd0436 add collection of selection points. 2023-01-18 21:34:23 +01:00
ansel
77bc4fbf70 Integrate editor into comment 2023-01-18 20:50:07 +03:00
ansel
0d91277ea5 Add ability to change number on replies button 2023-01-18 20:49:30 +03:00
ansel
c74500b4b4 Add reply editor 2023-01-18 20:49:07 +03:00
Bartłomiej Dach
761298cd8e
Merge pull request #22275 from peppy/fix-legacy-old-judgement-animation
Fix legacy judgement animation not matching perfectly
2023-01-18 18:27:13 +01:00
Gabe Livengood
150195b887 use extension method to check accuracy impact 2023-01-18 12:24:41 -05:00
Gabe Livengood
e0f3fa1af6 remove this in ruleset assignment 2023-01-18 12:22:27 -05:00
Bartłomiej Dach
4a6f6300c5
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-18 17:15:20 +01:00
Bartłomiej Dach
7ba448b13c
Update comment to match implementation 2023-01-18 17:12:57 +01:00
cdwcgt
e5eab72aeb
add check for preview time setting 2023-01-19 01:08:37 +09:00
ansel
0f2ca5d5ed Expose method for drawable comment creation 2023-01-18 18:10:35 +03:00
Wleter
c9375c056e revert back name change 2023-01-18 15:54:24 +01:00
ansel
18baf3dd5d Log delete failure 2023-01-18 17:30:34 +03:00
StanR
24ed84aad0 Add tiered level badge colouring 2023-01-18 16:25:11 +03:00
Salman Ahmed
12fc5da143
Merge branch 'master' into frame-stable-cache 2023-01-18 14:16:46 +03:00
Dean Herbert
3b27774561 Remove OnlineID sort consideration 2023-01-18 19:21:02 +09:00
Dean Herbert
4ef940653b Fix legacy judgement animation not matching perfectly
This will be the final attempt to get it right. I was seemingly drunk
last time I wrote the logic.

Closes #21892.
2023-01-18 19:03:04 +09:00
Dean Herbert
43a037c189
Merge pull request #21620 from mk56-spn/JudgementCounter
Add a judgement counter to skin components
2023-01-18 18:43:49 +09:00
Dean Herbert
522bb8bcca Use ComputeAccuracy to get imminent accuracy 2023-01-18 18:08:58 +09:00
Dean Herbert
ecb4727aec Fix formatting issues 2023-01-18 17:33:14 +09:00
Dean Herbert
4cfb059170 Merge branch 'frame-stable-cache' into skin/argon-song-progress-cleaner 2023-01-18 17:21:08 +09:00
Dean Herbert
04705504c5 Move cache to more appropriate location 2023-01-18 17:19:57 +09:00
Dean Herbert
67b40dd234 Adjust the seek effect to feel better 2023-01-18 17:09:39 +09:00
Dean Herbert
01558a9199 Tidy up height logic and allow hovering above bar for easier interaction 2023-01-18 17:09:29 +09:00
Dean Herbert
f3677ab33d Simplify depth change logic 2023-01-18 16:38:21 +09:00
Dean Herbert
7d0388c55c Cache IFrameStableClock in Player for easier access
Allows directly referencing rather than going through `DrawableRuleset`.
Helps with testing and implementation of the new song progress display
(#22144).
2023-01-18 16:31:58 +09:00
Dean Herbert
42e9b2b48c Tidy up clock logic in all SongProgress classes 2023-01-18 16:29:42 +09:00
Dean Herbert
8bfd853889 Fix missing comment 2023-01-18 16:11:14 +09:00
Dean Herbert
bfb75730a9 Prefix subclasses of DefaultSongProgress with Default 2023-01-18 15:45:16 +09:00
Dean Herbert
1e5dd9165a Adjust SkinnableTestScene to give more breathing room to RelativeSize components 2023-01-18 15:37:46 +09:00
Dean Herbert
7266d8e10d Move "show difficulty graph" settings back to respective implementations to avoid legacy version showing it 2023-01-18 15:31:55 +09:00
Dean Herbert
5a272b4bd6
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 15:25:02 +09:00
Dean Herbert
742a026077 Add comment mentioning why reference clock fallback logic is required 2023-01-18 15:24:35 +09:00
Dean Herbert
e8770b84cd Remove no longer necessary interface type 2023-01-18 15:23:55 +09:00
Dean Herbert
5429979049 Combine common code into SongProgress base class 2023-01-18 15:23:55 +09:00
Dean Herbert
afc12e0b83 Tidy up ISongProgressBar interface 2023-01-18 14:43:20 +09:00
Dean Herbert
f7c4199a77
Merge pull request #22262 from Joehuu/chat-mention-user
Add ability to easily mention users in chat by right clicking username
2023-01-18 13:30:02 +09:00
Dean Herbert
736ff419c0
Merge pull request #22261 from peppy/fix-bad-operation
Fix song select potentially operating on `Carousel` before it is fully loaded
2023-01-18 12:06:33 +09:00
Dean Herbert
4ad79a8a0a Move IsLoaded check inside BeatmapCarousel 2023-01-18 12:00:47 +09:00
Dean Herbert
0a47dc733f
Merge pull request #22268 from Feodor0090/comments-margin
Reduce padding for too nested comments
2023-01-18 11:45:41 +09:00
ansel
ca3be71381 Track comment's nesting and reduce padding for too nested 2023-01-18 02:11:07 +03:00
ansel
12544c16ea Remove canBeNull 2023-01-18 02:10:02 +03:00
Joseph Madamba
dfea42fd16 Add space after username mention 2023-01-17 14:13:50 -08:00
Joseph Madamba
254c881ded Also check null for bindable channel value 2023-01-17 14:12:48 -08:00
Bartłomiej Dach
f7c942ac10
Move user stats into detail header container 2023-01-17 22:32:24 +01:00
Bartłomiej Dach
7a475d9cf8
Move out stats from top header container 2023-01-17 22:32:15 +01:00
Bartłomiej Dach
350cce1315
Move contents of detail header to separate component 2023-01-17 22:32:12 +01:00
mk56-spn
92a755c5da adjust colourbar to position itself in a more simple fashion 2023-01-17 22:16:59 +01:00
Bartłomiej Dach
f5459909f9
Merge branch 'master' into comment-editor-3 2023-01-17 21:31:08 +01:00
Bartłomiej Dach
3640342805
Add logging on comment post failure 2023-01-17 21:30:46 +01:00
Wleter
788033e1b8 fix unnecessary newline 2023-01-17 21:13:54 +01:00
Bartłomiej Dach
6f11fbdeed
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-17 20:46:06 +01:00
Wleter
b8e6a2d87b filter currentEndPointPositions 2023-01-17 20:41:49 +01:00
Joseph Madamba
97bd76efc6 Add ability to easily mention users in chat by right clicking username 2023-01-17 10:01:07 -08:00
tsrk
f1989ba24d
quality: remove unused Darken bindable boolean 2023-01-17 17:26:05 +00:00
Dean Herbert
8e1002b744 Fix song select potentially operating on Carousel before it is fully loaded
Should fix test failures like
https://github.com/ppy/osu/actions/runs/3939620830/jobs/6739690253.
2023-01-18 01:56:18 +09:00
Gabe Livengood
0b1e5c0f53 lambdaify function 2023-01-17 10:23:57 -05:00
tsrk
d91aa341e5
refactor(ArgonSongProgress): reorder layering and make density graph visible for past time 2023-01-17 13:16:56 +00:00
Dean Herbert
26cd70f2bf Always use production (non-experimental) endpoints for tournament client 2023-01-17 18:46:06 +09:00
Dean Herbert
14649160e1 Adjust transform delay to make things feel more snappy 2023-01-17 18:39:21 +09:00
Dean Herbert
81aa7feeb5 Fix using FadeTo on a visibility container 2023-01-17 18:39:21 +09:00
Dean Herbert
48959c0212 Start name not visible to avoid pop out when hidden on startup 2023-01-17 18:35:19 +09:00
Dean Herbert
7d1fd24ab4 Start all counters hidden to fix pop out animation when some portions are hidden 2023-01-17 18:31:25 +09:00
Dean Herbert
448abf897a Tidy up direction assignment 2023-01-17 18:31:08 +09:00
Dean Herbert
ca17993769 Don't use OverlayContainer (what) 2023-01-17 18:30:50 +09:00
Dean Herbert
181473c5fc Rename flow to better match its purpose 2023-01-17 18:28:08 +09:00
Dean Herbert
35ad66eef9 Give flow container a type to avoid locally casting in every location 2023-01-17 18:27:33 +09:00
Dean Herbert
09c7ab3af6 Rename exposed settings to make more sense 2023-01-17 18:27:15 +09:00
Dean Herbert
f923dc5009 Use framework Direction instead of local enum
It should be stable enough to use.
2023-01-17 18:27:15 +09:00
Dean Herbert
0a7d6948ca Nest model class 2023-01-17 18:19:04 +09:00
Dean Herbert
b62b5714e8 Fix TierColours assignment 2023-01-17 18:07:11 +09:00
Dean Herbert
65bd2e74fd Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-17 18:00:42 +09:00
MK56
a55ce9b586
Merge branch 'master' into JudgementCounter 2023-01-17 09:55:45 +01:00
Dean Herbert
53e7873f6c
Merge branch 'master' into fix-pause-gameplay-action-not-closing 2023-01-17 17:41:16 +09:00
Dean Herbert
a1152fa0db
Merge pull request #22147 from Feodor0090/forbid-negative-snap
Forbid negative time snap in editor
2023-01-17 17:35:45 +09:00
Joseph Madamba
da0eb9b0cb Simplify TriggerClicks in gameplay menu overlays 2023-01-17 00:34:52 -08:00
Dean Herbert
c799375ae0
Merge pull request #20709 from Domilz/toolbar-localisation
Localise toolbar home button and ruleset description tooltips
2023-01-17 17:28:34 +09:00
Dean Herbert
23ea77cb74 Use ScoreProcessor to fetch accuracy rather than calculating manually 2023-01-17 17:03:04 +09:00
Dean Herbert
70cb23bbc9
Merge branch 'master' into mod-accuracy-challenge 2023-01-17 16:46:54 +09:00
Dean Herbert
a9ac28b504 Add fallback sorts to CarouselBeatmapSet to ensure stable sorting 2023-01-17 16:40:25 +09:00
Joseph Madamba
8f7cb18217 Use TriggerClick() instead of calling BackButton action for pause gameplay 2023-01-16 23:36:28 -08:00
Joseph Madamba
08c570849f Simplify container logic 2023-01-16 23:24:47 -08:00
Dean Herbert
9acf22b2b1
Merge branch 'master' into song_select_nullability 2023-01-17 15:29:37 +09:00
Dean Herbert
ef35493864 Avoid need for weird null check by reordering initialisation process 2023-01-17 15:27:21 +09:00
Dean Herbert
a02556d2fa Move hover logic to SettingsToolboxGroup to avoid expanded state clash 2023-01-17 14:43:22 +09:00
Dean Herbert
6a0bf89401 Merge branch 'master' into replay-menu-expanded-state-memory 2023-01-17 14:30:23 +09:00
Dean Herbert
776b6fa2e1
Merge pull request #22203 from bdach/fix-new-diff-creation-fail
Fix difficulty creation flow failing for some ruleset combinations
2023-01-17 14:08:34 +09:00
Dean Herbert
1f47def3c4
Merge branch 'master' into skin-editor-loc 2023-01-17 11:53:08 +09:00
Bartłomiej Dach
0c5a436754
Merge pull request #22241 from stanriders/refactor-levelbadge
Refactor `LevelBadge` to use `LevelInfo`
2023-01-16 23:33:03 +01:00
Bartłomiej Dach
f79037cefb
Move to LoadComplete() better 2023-01-16 21:47:31 +01:00
StanR
3f75506552 Move binding to LoadComplete 2023-01-16 23:42:07 +03:00
StanR
c5d09c0e2c
Rename variable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-16 23:36:50 +03:00
StanR
6207a96a29 Refactor LevelBadge to use LevelInfo 2023-01-16 23:24:09 +03:00
ansel
133b9b79d7 Do not touch "currently editing" line 2023-01-16 22:52:17 +03:00
Bartłomiej Dach
bf58fe21ce
Merge branch 'master' into beatmap-set-converted-beatmaps 2023-01-16 20:46:41 +01:00
ansel
17aeb0ec19 Localise editor's UI 2023-01-16 19:55:28 +03:00
ansel
6eb5508404 Localise menu bar 2023-01-16 19:39:50 +03:00
ansel
26f3b1dbfe Localise "revert to default" tooltip 2023-01-16 19:37:47 +03:00
Dean Herbert
4224907f08
Merge pull request #22208 from Feodor0090/editor-loc
Localise most visible parts of editor
2023-01-16 23:05:17 +09:00
Dean Herbert
988544073c
Merge branch 'master' into ruleset-settings-loc 2023-01-16 13:29:15 +09:00
Dean Herbert
d19b35bd5f Rename ambiguous translation keys 2023-01-16 13:18:49 +09:00
OliBomby
832d033777 Fix merge issues 2023-01-16 01:09:04 +01:00
OliBomby
ab6bf6e1dc Merge remote-tracking branch 'upstream/master' into carousel 2023-01-16 00:27:56 +01:00
Joseph Madamba
6a847faea9 Make home string keys more specific 2023-01-15 15:23:26 -08:00
Joseph Madamba
0ff143d4c8 Add argument for play some ruleset string 2023-01-15 15:23:26 -08:00
OliBomby
1c0a650575 Fix typo 2023-01-16 00:17:26 +01:00
OliBomby
87ee9ab813 Added custom menu items in DrawableCarouselBeatmap 2023-01-16 00:13:12 +01:00
Joseph Madamba
ae49e724e4 Move converted beatmap icons logic locally 2023-01-15 15:09:25 -08:00
Joseph Madamba
b733f46c6f Apply NRT to BeatmapPicker 2023-01-15 15:09:25 -08:00
Joseph Madamba
27671f0401 Merge remote-tracking branch 'upstream/master' into pr/20709 2023-01-15 15:08:11 -08:00
Joseph Madamba
85c1932851 Mark Converts as nullable 2023-01-15 12:46:41 -08:00
ansel
6f84641596 Localise osu!mania settings 2023-01-15 23:30:20 +03:00
ansel
9ce7c51b14 Localise osu! settings 2023-01-15 23:29:58 +03:00
ansel
00acea59fc Move some strings to common 2023-01-15 19:37:40 +03:00
mk56-spn
9a29c9ae26 remove hacky method to check if carousel is null 2023-01-15 15:32:53 +01:00
Dean Herbert
c5775aa452
Merge branch 'master' into song_select_nullability 2023-01-15 22:44:13 +09:00
Dean Herbert
4cf4a66858 Make MusicController a required dependency of SongSelect 2023-01-15 22:43:30 +09:00
Dean Herbert
f7af5a8115 Revert some formatting changes 2023-01-15 22:39:00 +09:00
Salman Ahmed
13c1b8f5a4 Fix intermittent failure in tests with restarting player instances 2023-01-15 16:06:06 +03:00
ansel
5d2e09137c Remove text padding in editor menu for now 2023-01-15 14:40:53 +03:00
ansel
8777d5349b Use existing strings 2023-01-15 14:39:34 +03:00
Joseph Madamba
627d1725c3 Fix kudosu wiki link from user profile not linking to in-game overlay 2023-01-14 19:56:51 -08:00
ansel
87650044bb Localise create/save dialog 2023-01-15 01:50:47 +03:00
ansel
78e562903d Localise part of editor 2023-01-15 01:50:47 +03:00
ansel
24df23f420 Localise background header 2023-01-15 01:49:19 +03:00
ansel
76eefc7573 Add support for localisation where it was missing 2023-01-15 01:46:11 +03:00
integer
a68d4fe5d1 make expansion to not use scheduler 2023-01-14 21:18:51 +00:00
ansel
1480c691ae Explain empty string in editor's footer 2023-01-14 23:42:56 +03:00
ansel
c36922dd2c Use clock to obtain a position for comment insertion 2023-01-14 22:57:51 +03:00
ansel
c2bb0949f5 Take type and id from container directly on submit 2023-01-14 22:57:23 +03:00
ansel
cdf3aafddd Add check for any drawables in content before looking for placeholder 2023-01-14 22:37:05 +03:00
Bartłomiej Dach
a9facc076f
Fix difficulty creation flow failing for some ruleset combinations
In current `master`, the difficulty creation flow would retrieve a
"reference beatmap" to copy metadata and timing points from using
`GetPlayableBeatmap()`. But, importantly, it was calling that method
using *the ruleset of the new difficulty* rather than the ruleset of the
existing one. This would make the difficulty creation flow fail if the
beatmap couldn't be converted between rulesets (like taiko to catch).

Fixing to use the reference beatmap's actual ruleset would be trivial,
but there's no real reason to do all of that work anyway when a
`WorkingBeatmap` is available. Because getting a playable beatmap is not
required to copy across metadata and timing points, remove the
`GetPlayableBeatmap()` step entirely to fix the bug.

Closes #22145.
2023-01-14 19:46:55 +01:00
Joseph Madamba
e7ab543799 Add ability to view converted beatmaps on beatmap set overlay 2023-01-14 10:26:21 -08:00
ansel
88c3eef8e1 Add test case with no existing comments 2023-01-14 20:59:13 +03:00
Dean Herbert
efe6dae672
Merge pull request #22200 from bdach/user-profile/update-design-basics
Update user profile appearance to closer match web
2023-01-15 02:50:11 +09:00
Dean Herbert
4906f37109
Merge pull request #22181 from frenzibyte/attempt-fix-song-select-test-failure
Fix intermittent failure in beatmap carousel tests
2023-01-15 02:35:36 +09:00
ansel
fbb674d8e9 Rename parent comment id field 2023-01-14 20:15:19 +03:00
Bartłomiej Dach
67a3ea2c59
Fix wrong date colour of kudosu history items 2023-01-14 17:50:18 +01:00
Bartłomiej Dach
bfca75395b
Adjust colour of top header container 2023-01-14 17:37:33 +01:00
Bartłomiej Dach
6a9d842660
Adjust user profile header detail appearance 2023-01-14 17:37:31 +01:00
Bartłomiej Dach
de077403e9
Adjust visual appearance of profile value displays 2023-01-14 17:37:28 +01:00
Bartłomiej Dach
f80dddbb5e
Rearrange and adjust header components where simple 2023-01-14 17:17:28 +01:00
Bartłomiej Dach
e39eb089ce
Update colouring of some profile section elements 2023-01-14 17:17:26 +01:00
Bartłomiej Dach
5b1111c6b1
Adjust appearance of user profile sections 2023-01-14 17:17:24 +01:00
Bartłomiej Dach
3f81f173fb
Adjust appearance of section navigation 2023-01-14 17:17:21 +01:00
Bartłomiej Dach
49e08c06a6
Adjust general appearance of user profile overlay 2023-01-14 16:59:51 +01:00
Bartłomiej Dach
5e1ea8b34f
Merge branch 'master' into move-overlay-ruleset-selectors 2023-01-14 15:22:14 +01:00
integer
2831db53f7 fix wrong control flow on hover lost 2023-01-14 14:19:02 +00:00
Dean Herbert
2f2ab445c9
Merge pull request #22182 from stanriders/status-icon
Update status icon design
2023-01-14 21:05:44 +09:00
ekrctb
e610d19d55
Merge branch 'master' into 18469 2023-01-14 19:53:08 +09:00
Dean Herbert
cfc8fd0aa1
Merge pull request #22188 from Feodor0090/nofs-locale
Localise some notifications
2023-01-14 18:12:54 +09:00
Dean Herbert
a6e7efa62c
Merge pull request #22194 from Feodor0090/more-editor-nrt
Enable nullability for setup, design and timing editor screens
2023-01-14 18:11:46 +09:00
StanR
e07c0c7c1f Using 2023-01-14 02:58:18 +03:00
ansel
bb8bcd7248 Move avatar update bind to LoadComplete 2023-01-14 02:50:30 +03:00
ansel
c95d8645f3 Revert "Use existing string"
This reverts commit f950b624ae.
2023-01-14 02:42:04 +03:00
ansel
9e7ecbf4a1 Adapt to changes in base class 2023-01-14 02:41:11 +03:00
ansel
e9995410e8 Merge branch 'master' into comment-editor-3 2023-01-14 02:32:06 +03:00
StanR
cb4f32e7bd Use StatusIcon in UserDropdown 2023-01-14 02:31:27 +03:00
ansel
77e8315ee2 Adjust naming 2023-01-14 02:30:10 +03:00
StanR
e2d6e31314 Using 2023-01-14 02:26:26 +03:00
ansel
f70dedfd17 Enable nullability for design screen 2023-01-14 02:24:48 +03:00
ansel
4b42240fba Enable nullability for setup screen 2023-01-14 02:24:28 +03:00
ansel
78adaa9b03 Enable nullability for timing screen 2023-01-14 02:23:21 +03:00
StanR
660bf748d5 Fix GroupBadge crashing on null group colour 2023-01-14 02:23:08 +03:00
integer
c3c1d77e8e make PlayerSettingsGroup expand on hover 2023-01-13 23:07:59 +00:00
integer
0b5c89d01f revert additions to SessionStatics 2023-01-13 23:07:21 +00:00
StanR
85b2154f3a Set border colour to white 2023-01-14 01:12:17 +03:00
Bartłomiej Dach
ab3d39a940
Merge branch 'master' into comment-editor-1 2023-01-13 22:41:41 +01:00
ansel
d67184bd80 Autoformat code 2023-01-14 00:26:44 +03:00
ansel
f950b624ae Use existing string 2023-01-14 00:26:35 +03:00
Joseph Madamba
5750d82c0a Move overlay ruleset selectors to tab control 2023-01-13 12:50:35 -08:00
StanR
2e28f5ed33 Add StatusIcon 2023-01-13 23:18:24 +03:00
ansel
515ada6815 Remove CanBeNull where it's no longer requered 2023-01-13 23:11:50 +03:00
ansel
a41a031909 Localise some notifications 2023-01-13 23:11:25 +03:00
ansel
c62d416680 Add localisation for notification overlay 2023-01-13 22:54:38 +03:00
Salman Ahmed
112cf403ec Fix intermittent failure in certain beatmap carousel tests 2023-01-13 19:41:44 +03:00
Dylan Nantz
6028abff39 Code Quality 2023-01-13 10:16:52 -05:00
Dylan Nantz
5dd0aaccef Merge branch 'master' of https://github.com/ppy/osu into 18469 2023-01-13 09:54:29 -05:00
Dylan Nantz
e38075c4ef Use PlacementState to check juice stream placement 2023-01-13 09:37:23 -05:00
mk56-spn
a6b6fb864e Make carousel non nullable and ensure pre load usages of methods that reference it are protected against failure 2023-01-13 13:10:29 +01:00
Dean Herbert
11f630d49d Prefill username and email 2023-01-13 15:42:34 +09:00
Dean Herbert
4d58e6d8d2 Add UI support for redirecting the user to web registration 2023-01-13 15:36:45 +09:00
Dean Herbert
a7327b02a2 Add API level support for error message and redirect during registration flow 2023-01-13 15:32:53 +09:00
Dean Herbert
5658c3a123 Enable NRT on account creation classes 2023-01-13 15:29:25 +09:00
Dean Herbert
6daa37bd3e
Merge pull request #22168 from Joehuu/fix-mute-button-closing-overlays
Fix mute button not blocking outside overlay closing presses
2023-01-13 12:35:03 +09:00
Joseph Madamba
5a38abe679 Add comment highlighting reason for blocking mouse down 2023-01-12 19:32:53 -08:00
Dean Herbert
55f1c7c49d
Merge pull request #22160 from EVAST9919/ruleset-selector-online
Don't display custom rulesets in online overlays
2023-01-13 12:16:42 +09:00
Dean Herbert
464c5eaa2f
Fix grammar 2023-01-13 12:16:35 +09:00
Dean Herbert
73189e49ab
Merge pull request #22163 from frenzibyte/fix-intermittent-channel-test-failure
Fix intermittent failure in silenced user messages test
2023-01-13 11:23:45 +09:00
Dean Herbert
ea4eb6055e
Merge pull request #22169 from Feodor0090/timeline-nullability
Enable nullability for editor components
2023-01-13 11:21:42 +09:00
mk56-spn
403ca05e5e Enable nullability for song select 2023-01-13 00:52:14 +01:00
ansel
c554a34eaf Add "fps" keyword to frame limiter dropdown 2023-01-13 02:11:05 +03:00
Joseph Madamba
a16050534d Fix mute button not blocking outside overlay closing presses 2023-01-12 14:20:16 -08:00
Andrei Zavatski
d74a5ef9e6 Use property instead of ctor parameter 2023-01-12 23:26:29 +03:00
Andrei Zavatski
a7ac31fa34 Use IsLegacyRuleset extension method 2023-01-12 23:21:33 +03:00
Salman Ahmed
115cb0d297 Fix channel manager test scene not waiting for notifications client connection 2023-01-12 23:14:23 +03:00
Andrei Zavatski
1dae1149cb Don't display non-legacy rulesets in beatmap listing 2023-01-12 22:52:45 +03:00
Andrei Zavatski
a9915d6a64 Make OverlayRulesetSelector display only legacy rulesets 2023-01-12 22:44:41 +03:00
ansel
0bd1c46c74 Undo sizing changes 2023-01-12 19:48:11 +03:00
ansel
2365b065a4 Enable nullability for editor components 2023-01-12 18:07:54 +03:00
Ruki
4439698867
Update osu.Game/Screens/Play/HUD/ArgonSongProgress.cs 2023-01-12 13:19:03 +01:00
Dean Herbert
d2309feec2
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-12 19:49:27 +09:00
Dean Herbert
123c477e00
Merge branch 'master' into ui/segmented-graph 2023-01-12 19:02:49 +09:00
tsrk
bb2ece5c71
refactor(SegmentedGraph): adjust tierCount based on passed Colours 2023-01-12 10:57:12 +01:00