1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 00:33:21 +08:00
Commit Graph

3285 Commits

Author SHA1 Message Date
Bartłomiej Dach
041318e3e8
Assign red colour to ComboBreak hit result
For a judgement result to show up on the colour hit error meter, it has
to be two things: be scorable, and not be bonus.

`ComboBreak` happens to meet both of those criteria - it impacts score
indirectly via decreasing the combo portion, and isn't bonus. Therefore
it would show up on the colour hit error meter, but because
`OsuColour.ForHitResult()` wasn't handling it explicitly, it was
painting the result in light blue, which isn't ideal for a miss type
judgement. Therefore, use red instead.

There is possibly an argument to be made that this judgement should not
show up on the colour hit error meter at all, but I think it's actually
okay for it to be this way. In any case it doesn't appear to be anything
so major as to warrant blocking the hold note tick removal at this time.
2023-10-11 19:44:46 +02:00
Dean Herbert
f2e56bbb65
Fix publicly-settable bindables 2023-10-06 16:51:24 +09:00
Dean Herbert
d4cf6e100f Update other usages of OsuIcon.ModBg and remove 2023-09-28 19:03:34 +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
c1a2b86f3f
Extract constants properly 2023-09-11 08:29:37 +02:00
Joseph Madamba
2fbd67cf26
Merge branch 'master' into beatmap_wedge_clean_ii 2023-09-04 11:24:20 -07:00
Magnus-Cosmos
40dbf098d2
Use existing localisation for "view profile" 2023-09-02 22:51:08 -04:00
Dean Herbert
bf0f4fddad Localise non-overridden samples 2023-08-25 01:08:22 +09:00
Dean Herbert
081fb308e1 Merge branch 'master' into new-overlay-sfx 2023-08-24 18:29:00 +09:00
Jamie Taylor
f4415a5bab
Add more detail to comment 2023-08-24 18:20:36 +09:00
Jamie Taylor
7ef5a71e91
Move PopIn/PopOut sample playback from WaveOverlayContainer to WaveContainer (so Multiplayer/Lounge plays the samples) 2023-08-24 18:13:23 +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
5f040a991b Fix potential crash when loading menu items due to cross-thread ops 2023-08-21 19:05:20 +09:00
Dean Herbert
fc2fac577f Inverse and xmldoc ShearedToggleButton sample allowance bool 2023-08-18 17:05:25 +09:00
Jamie Taylor
d10d7b6ea4
Change some component samples to go better with overlay pop-in samples 2023-08-17 18:36:37 +09:00
Jamie Taylor
3d7ba0e18c
Add pop-in/pop-out sfx to more overlays 2023-08-17 18:36:37 +09:00
Jamie Taylor
04a1f6a508
Add panning to certain overlay pop-in/pop-outs 2023-08-17 18:36:37 +09:00
Bartłomiej Dach
19f892687a
Add precise rotation control to osu! editor 2023-08-16 11:37:52 +02:00
Bartłomiej Dach
bdf87e43db
Merge branch 'master' into slider-with-textbox-instantaneous 2023-08-16 10:48:45 +02:00
Bartłomiej Dach
ab1d523528
Fix kiai stars flickering on and off during gameplay
Closes #24503.

The problematic reset of `lastParticleAdded` has been moved to a place
that should hopefully (a) not cause such problems and (b) be much more
explicit about what's happening.
2023-08-15 07:44:05 +02:00
Dean Herbert
34c761946c Don't completely fade FPS counter out when running at full FPS
I've heard multiple times from uses that this is distracting or
confusing.
2023-08-14 23:55:57 +09:00
Dean Herbert
0e510088f9 Ensure background of gameplay is black when storyboard is overriding background display 2023-08-02 15:50:15 +09:00
Dean Herbert
a618ed140e Move StoryboardReplacesBackground bindable more local to usage 2023-08-02 15:29:18 +09:00
Bartłomiej Dach
4fb0ff8800
Implement instantaneous SliderWithTextBoxInput mode 2023-08-01 01:02:16 +02:00
Bartłomiej Dach
ca81f23356
Add test covering non-instantaneous behaviour 2023-08-01 01:01:37 +02:00
Bartłomiej Dach
2e2b0c4e41
Move SliderWithTextBoxInput to more general namespace 2023-08-01 01:01:36 +02:00
Bartłomiej Dach
3b9f250c1b
Merge branch 'master' into menu-star-fountains 2023-07-25 21:58:13 +02:00
Bartłomiej Dach
f3a95d4c13
Merge branch 'master' into menu-star-fountains 2023-07-19 21:26:41 +02:00
Dean Herbert
5e2a0bd733 Fix spawning edge case when elapsed became unexpectedly negative 2023-07-19 14:10:27 +09:00
Dean Herbert
7fa95f7512 Fix #region 2023-07-19 13:52:43 +09:00
Dean Herbert
2e3d1fe950 Fix regression in time jumping behaviour 2023-07-19 13:38:04 +09:00
Dean Herbert
ccbb30cdda Fix ParticleSpewer not correctly accounting for lower frame rates (and spawning less particles) 2023-07-18 19:52:45 +09:00
Dean Herbert
1dc293ed61 Allow specifying a custom width for nubs in OsuCheckboxes 2023-07-14 14:24:55 +09:00
Dean Herbert
ded7ec3aa6
Merge branch 'master' into framework-clipboard 2023-07-14 03:32:37 +09:00
Dean Herbert
20e4e2581a Change IBeatSyncProvider.Clock to always be non-null 2023-07-13 22:13:40 +09:00
Dean Herbert
db37de45ac Allow saving changes to presets in popover using "select" binding 2023-07-13 17:53:26 +09:00
Susko3
2dcd790442 Resolve Clipboard via DI 2023-07-11 11:42:31 +02:00
Dean Herbert
5f880397a9 Increase the minimum size of the scroll bar
Allows easier targetting when there is a lot of content in the scroll view

As discussed in https://github.com/ppy/osu/discussions/24095#discussioncomment-6332398.
2023-07-02 00:04:56 +09:00
Bartłomiej Dach
df2dcf85b4
Fix wrong disable 2023-06-24 17:07:42 +02:00
Bartłomiej Dach
e3a89a6273
Fix remaining obvious CI inspections 2023-06-24 16:07:01 +02:00
Bartłomiej Dach
2c1a44da89
Revert nullability enable in BeatmapBackground
Due to varying expectations in handling of `Beatmap`. Some places allow
or expect null and some don't. Needs to be looked at closer separately.
2023-06-24 15:40:06 +02:00
Dean Herbert
df5b389629 Manual fixes to reduce warnings to zero 2023-06-24 01:52:53 +09:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
Dean Herbert
7c5813c05a Fix OsuAnimatedButton not flashing when triggered via code 2023-06-20 16:34:22 +09:00
Bartłomiej Dach
b87acfa66f
Dynamically change placeholder to convey how to activate search 2023-06-18 15:58:50 +02:00
Bartłomiej Dach
9ba4bf5fb7
Merge branch 'master' into add-mod-search-option 2023-06-18 15:06:21 +02:00
Dean Herbert
eb31fdecee Apply osu! side changes in line with FocusedOverlayContainer.PopIn abstract change
See https://github.com/ppy/osu-framework/pull/5834
2023-06-18 20:57:32 +09:00
Dean Herbert
a62b11606e Attempt to fix NaN fps display
The only thing I can see which could cause this is reading from the `drawClock.ElapsedFrameTime` after the `isSpike` read causing a div-by-zero. Reading the values once at the start should avoid this.
2023-06-17 01:32:45 +09:00
Joseph Madamba
874ce4fe71
Merge remote-tracking branch 'upstream/master' into pr/22239 2023-06-14 07:06:55 -07:00
Dean Herbert
8864014af8 Add xmldoc 2023-06-12 15:25:45 +09:00
Joseph Madamba
0d51e4f6ce
Fix mod select panels having conflicting tooltips
Going simple with a bool instead of making `TooltipText` init-able, as the current cases will just init `string.Empty`. And not sure if we want custom tooltip text in the future.
2023-06-10 12:24:58 -07:00
Joseph Madamba
61a9c6fd7e
Disable Truncate in OsuSpriteText
Co-Authored-By: Salman Ahmed <frenzibyte@gmail.com>
2023-06-10 11:53:45 -07:00
Cootz
036479dd9d
Merge branch 'master' into add-mod-search-option 2023-06-09 16:27:18 +03:00
Joseph Madamba
85fedbd025
Add tooltips to truncated text 2023-06-08 19:44:07 -07:00
Bartłomiej Dach
281aae91ec
Merge pull request #23808 from peppy/working-beatmap-get-background
Refactor `IWorkingBeatmap.Background` to `GetBackground()`
2023-06-08 12:23:07 +02:00
Dean Herbert
a842f79ad4 Refactor IWorkingBeatmap.Background to GetBackground() 2023-06-08 16:19:32 +09:00
Dean Herbert
67e952150f Fix scroll operations in SectionsContainer failing if target moves due to loaded content 2023-06-07 16:32:29 +09:00
Dean Herbert
7d49f5d7c6 Apply NRT to SectionsContainer 2023-06-07 16:32:29 +09:00
Salman Ahmed
62cb6a98ca Remove redundant nullable suppression directives 2023-06-07 08:20:41 +03:00
Dean Herbert
289f0e9862 Use FireAndForget to avoid unobserved exception 2023-06-01 15:50:37 +09:00
Dean Herbert
0a7d5a51d4 Fix mouse cursor potentially disappearing for good if screenshot capture fails 2023-06-01 15:50:13 +09:00
Dean Herbert
20439e80f6 Adjust background colour used in LabelledDrawables to allow visibility of sliders 2023-05-31 23:24:21 +09:00
cdwcgt
a05312c9a2
simplify format method
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-05-27 23:44:50 +09:00
cdwcgt
89c8ef3c9b
Format percentage based on significant decimal digits 2023-05-27 23:35:59 +09:00
Dean Herbert
e5451d1d79 Centralise definition of overlay shadow opacity and reduce slightly 2023-05-24 12:40:35 +09:00
Cootz
c3f06ad2db
Merge branch 'master' into add-mod-search-option 2023-05-23 08:55:57 +03:00
Bartłomiej Dach
8e0a97ca49
Remove usage of HasSubmenu
Property has been removed in the appropriate framework-side PR and
instead folded into `IsActionable`.

See: https://github.com/ppy/osu-framework/pull/5658#discussion_r1114834647
2023-05-20 18:02:12 +02:00
Bartłomiej Dach
67c044773b
Merge branch 'master' into fix-menu-state-display 2023-05-20 17:57:00 +02:00
Cootz
2467813d81 Block deselect all short key when using the search box 2023-05-09 16:14:42 +03:00
Bartłomiej Dach
3942281d13
Fix back-to-front logic 2023-05-06 15:34:55 +02:00
Bartłomiej Dach
52e5835be6
Document and retouch ReportPopover 2023-05-06 14:52:38 +02:00
Dean Herbert
be15d07b17 Tidy up various implementation details 2023-05-03 18:59:39 +09:00
Dean Herbert
4f55afb60d Merge branch 'master' into chat-report 2023-05-03 18:50:38 +09:00
Bartłomiej Dach
de1b28bcb2
Fix incorrect initial state of checkbox
This only ever barely used to work without the `(..., true)`
in `master` because of haphazard operation ordering.
2023-05-03 09:27:23 +02:00
Bartłomiej Dach
5f781bd6de
Move callback to LoadComplete()
Is the more correct place for `BindValueChanged()` callbacks.
2023-05-03 09:26:54 +02:00
Dean Herbert
a3efae3690 Fix potentially incorrect thread access in OsuTabControlCheckbox
https://github.com/ppy/osu/actions/runs/4868337922/jobs/8681736829.
2023-05-03 14:33:32 +09:00
Bartłomiej Dach
ec8362c6fc
Merge pull request #23367 from peppy/fix-uo-tooltip
Fix slider bar tooltips potentially showing negative zero
2023-05-02 18:03:09 +02:00
Dean Herbert
57f48e0703 Start colour black to ensure initial appear transition doesn't look silly 2023-05-02 14:33:57 +09:00
Dean Herbert
ab4f66fad3 Minor readability refactors 2023-05-02 14:31:39 +09:00
Dean Herbert
7efaa299bd Merge branch 'master' into scale-background-dim 2023-05-02 14:24:54 +09:00
Dean Herbert
ad40099e32 Ensure negative sign is only applied when the post-rounded result is negative 2023-05-02 14:00:52 +09:00
Dean Herbert
63890ef6fe Fix audio offset tooltip potentially showing "-0 ms"
Closes https://github.com/ppy/osu/issues/23339.
2023-05-02 13:24:22 +09:00
Haspamelodica
e90660c1a4 Switched to lowercase 2023-04-21 02:35:28 +02:00
Haspamelodica
b62de5514c Fixed video importing bug #23259 2023-04-21 02:10:24 +02:00
cdwcgt
19b7036b95
use same same duration
negligence in migrating code
2023-03-29 22:56:35 +09:00
cdwcgt
e85c28031e
change weird name 2023-03-29 22:55:25 +09:00
cdwcgt
46ede27869
add feature to adjust ScalingContainer background dim 2023-03-28 22:41:24 +09:00
cdwcgt
31df626f0e disable button when select other reason 2023-03-28 21:32:28 +09:00
cdwcgt
899860dd77 Merge branch 'master' into chat-report 2023-03-28 21:14:11 +09:00
Dean Herbert
ad5bdf6511 Merge branch 'master' into fix-ubo-not-bound 2023-03-22 16:46:39 +09:00
Dean Herbert
db227b1798 Merge branch 'master' into chat-report 2023-03-22 16:26:28 +09:00
Dan Balasescu
c08513d590 Actually use custom vertex action 2023-03-17 20:47:11 +09:00
Dan Balasescu
bcd24873d6 Use custom vertex type 2023-03-17 20:37:05 +09:00
Dan Balasescu
1c3b60b9e6 Use custom vertex shader for logo animation 2023-03-16 23:56:41 +09:00
Salman Ahmed
678e8ed736 Update UBO usages inline with framework changes 2023-03-16 14:06:35 +03:00
Dean Herbert
d65d09e45f Change field to const 2023-03-14 20:24:39 +09:00
Dean Herbert
969c0e9c9d Merge branch 'master' into veldrid-renderer 2023-03-14 17:35:38 +09:00
Bartłomiej Dach
72695f7c90
Merge branch 'master' into omit-barline-in-timing-control-point 2023-03-07 22:46:24 +01:00
Andrei Zavatski
31f58a33ac Use ColourInfo.Interpolate where possible 2023-02-28 18:47:27 +03:00
Dean Herbert
044b0604b2 Move OmitFirstBarLine to TimingControlPoint 2023-02-28 19:29:31 +09:00
Dan Balasescu
a44c9d10d7 Fix buffer not being bound 2023-02-25 02:18:42 +09:00
Dan Balasescu
dd9748a25c Adjust DrawNodes to use UBOs 2023-02-25 01:42:55 +09:00
Dean Herbert
6e48860c79 Update in line with framework menu handling changes 2023-02-22 17:13:55 +09:00
Dean Herbert
9ed068c1e6 Only apply dim changes when background blur is disabled 2023-02-15 14:16:34 +09:00
Joseph Madamba
24a5a1061f Fix OsuClickableContainer sounds not being blocked by nested drawables 2023-02-13 15:36:17 -08:00
Joseph Madamba
8d9245c1d4 Make AbortConfirm() virtual and override with filter logic 2023-02-11 12:54:16 -08:00
Joseph Madamba
d30d054b4c Add ability to abort dangerous dialog button on hover lost 2023-02-10 14:41:44 -08:00
Dean Herbert
5cd111e6f1 Fix ordering of methods in OsuSliderBar 2023-02-08 14:01:50 +09:00
Dean Herbert
cec1f77e6c Fix glow flash occurring after releasing mouse and adjust transition slightly 2023-02-08 13:59:09 +09:00
Dean Herbert
c691a0d3af
Merge branch 'master' into sheared_slider_implementation_clean_ii 2023-02-06 17:49:33 +09:00
Dean Herbert
ddcc02fdfe
Merge pull request #22505 from Joehuu/fix-hover-click-sounds
Fix some clickable elements having no hover and click sounds
2023-02-06 16:52:19 +09:00
Joseph Madamba
191259c050 Use equals instead and update other usage 2023-02-04 19:58:48 -08: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
5a76c1ab9c Refactor HoverSampleDebounceComponent to inherit Component 2023-02-03 00:29:25 -08: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
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
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
Andrei Zavatski
175b9fc5c9 Specify texelSize value in the Triangles background 2023-02-02 08:34:38 +03: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
Bartłomiej Dach
b1cbe20cd8
Adjust markdown text flow to framework-side changes 2023-01-30 20:48:52 +01:00
mk56-spn
091cc155d3 Fix nub naming in OsuCheckbox.cs and associated classes 2023-01-26 16:10:02 +01: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
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
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
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
Andrei Zavatski
04c96355cb Use TriangleBorder shader to draw triangles 2023-01-24 07:38:42 +03: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
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
Joseph Madamba
da03abc812 Fix comment editor text boxes not having sound feedback 2023-01-21 17:32:42 -08: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
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
Bartłomiej Dach
a0fe71c706
Use alternative segment colour computation method 2023-01-19 00:08:32 +01:00