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

35987 Commits

Author SHA1 Message Date
Bartłomiej Dach
3d31c9bbc5
Merge branch 'master' into beat-snap-divisor-hotkey 2022-10-25 20:32:32 +02:00
Dean Herbert
cf3bf41b49 Harden and simplify logic to avoid weird issues 2022-10-25 18:57:15 +09:00
Dean Herbert
da93849b80 Rename some pieces and better document SampleBankInfo 2022-10-25 14:55:33 +09:00
Dean Herbert
2b850694fa Merge branch 'allow-distance-grid-snap' into grid-momentary-shortcuts 2022-10-25 14:10:45 +09:00
Dan Balasescu
6177df2a24
Merge branch 'master' into fix-17143 2022-10-25 13:44:58 +09:00
Dean Herbert
22ea9a8ab4 Add early return of carousel group has no items 2022-10-25 13:34:22 +09:00
Dean Herbert
2456a18bc1 Rewrite implementation to avoid duplicated LINQ returns 2022-10-25 12:48:17 +09:00
Dean Herbert
4d4f6e25ba Rename to "clone" instead of "duplicate" 2022-10-25 11:43:23 +09:00
Dean Herbert
1e579e06f8 Fix duplicate working incorrectly if there is no selection currently made 2022-10-25 11:42:12 +09:00
Dean Herbert
da74690ec9 Add test coverage of clone operations 2022-10-25 11:38:58 +09:00
Endrik Tombak
5a118cfdc3 Merge branch 'master' of https://github.com/ppy/osu into carousel-perform-selection
 Conflicts:
	osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
2022-10-24 21:40:48 +03:00
Dean Herbert
247cf589aa
Merge branch 'master' into directoryselector-hidden-toggle 2022-10-24 15:33:10 +09:00
Dean Herbert
995216cced
Merge pull request #20819 from Joppe27/taiko-kiai-flashing
Implement taiko hitobject kiai flashing
2022-10-24 15:31:13 +09:00
Dean Herbert
1d5df15027 Add ability to use Shift+Number to set current beat divisor in editor 2022-10-24 15:20:15 +09:00
Dean Herbert
d0e6bda9ef Stop HitObjectComposer from handling Shift+Number keys 2022-10-24 15:19:36 +09:00
Dean Herbert
e72a71a28e Add simple editor "duplicate objects" key binding 2022-10-24 14:01:34 +09:00
Dean Herbert
e9b3048a8b Change the order of global bindings to give overlays lowest priority 2022-10-24 13:58:00 +09:00
Bartłomiej Dach
a55f91f54b
Merge branch 'master' into read-current-distance-snap 2022-10-24 00:15:15 +02:00
Bartłomiej Dach
3a6a87db0f
Merge branch 'master' into fix-editor-distanct-snap-sv-accounting 2022-10-23 18:42:08 +02:00
Susko3
a35026d537 Downgrade AutoMapper to fix Android startup crash 2022-10-22 23:29:44 +02:00
Dean Herbert
9155fcf3cb Update framework 2022-10-22 23:25:08 +09:00
Dean Herbert
3d37a67590 Update framework 2022-10-22 14:15:17 +09:00
Salman Ahmed
b0a4cd4f30 Inline content creation in base add method 2022-10-22 03:43:14 +03:00
Salman Ahmed
6c82bc36ed Encapsulate report logic inside button implementation
Avoids complicating the `DrawableComment` class, and allows for isolated
testability.
2022-10-22 02:48:27 +03:00
Salman Ahmed
9b5e35d599 Remove dependency on DrawableComment from report popover and simplify logic
Allows for testing the button and popover in isolation.
2022-10-22 02:47:33 +03:00
Salman Ahmed
081cf1cc47 Adjust comment report popover design 2022-10-22 02:45:31 +03:00
Salman Ahmed
0491b1fd18
Merge branch 'master' into update-framework 2022-10-21 22:39:56 +03:00
Dean Herbert
c1ed775deb Update framework 2022-10-21 23:36:16 +09:00
Dean Herbert
f516e32949 Improve UI a bit 2022-10-21 23:35:53 +09:00
Dean Herbert
bb921ff9a7 Fix incorrect current DS value when inside a slider 2022-10-21 23:35:47 +09:00
ansel
15aeb4a137 Display text in buttons flow instead of toast 2022-10-21 17:25:41 +03:00
Dean Herbert
f6de366766 Combine display and button into one control 2022-10-21 23:21:07 +09:00
Dean Herbert
645a84b1d6 Display current distance snap and add button to update to use it 2022-10-21 22:58:36 +09:00
Dean Herbert
7dc03097ff Change distance snap to never account for slider velocity
This is a nuanced detail that was implemented incorrectly from the
outset. When mapping, generally a mapper chooses the distance spacing
with no regard to the SV. It has always been common to have a lower
or higher distance spacing than SV, but with the way the lazer editor
has worked, the SV was multiplied into the distance snap grid display,
incorectly changing its spacing depending on the "reference object"
(which is usually the previous hitobject chronologically).
2022-10-21 21:51:24 +09:00
Dean Herbert
447d420c99 Fix adjusting volume via settings playing tick samples twice 2022-10-21 21:03:39 +09:00
Dean Herbert
4803f606c2
Merge pull request #20845 from nekodex/settings-sidebar-sfx
Add unique hover/select samples to settings sidebar buttons
2022-10-21 20:56:58 +09:00
Dean Herbert
8b74b5807f Update resources 2022-10-21 20:53:37 +09:00
Dean Herbert
af84f708b7 Avoid serialising some more properties of SoloScoreInfo unless present 2022-10-21 19:30:35 +09:00
Jamie Taylor
7b1edff2b3
Add unique hover/select samples to settings sidebar buttons 2022-10-21 18:06:38 +09:00
Dean Herbert
6cdfddea62 Always enable distance spacing when adusting distance space multiplier 2022-10-21 16:10:55 +09:00
Dan Balasescu
703a8afb11
Merge pull request #20809 from peppy/fix-taiko-broken-drum-roll-ticks
Fix taiko drum roll ticks sometimes overflowing outside the drum roll itself
2022-10-21 12:56:14 +09:00
Dean Herbert
7dbd6e2469
Merge branch 'master' into taiko-kiai-flashing 2022-10-21 12:48:35 +09:00
Salman Ahmed
27ce3d8342 Fix input settings not displaying in visual test browser 2022-10-21 01:52:19 +03:00
Joseph Madamba
bf4a91f1f0 Fix skin toolbox component button not playing hover/click sounds 2022-10-20 13:16:03 -07:00
ansel
81bdf716ef Change test 2022-10-20 19:56:00 +03:00
ansel
0ef903230c Make report button a separate component 2022-10-20 18:47:42 +03:00
ansel
da4f04ace7 Make dropdown not resize 2022-10-20 18:22:55 +03:00
ansel
635900085c Disable button when there is no text 2022-10-20 18:12:20 +03:00
ansel
ed39481932 Use another string for title 2022-10-20 18:11:35 +03:00
Dean Herbert
5c13c443ff Fix incorrect fallback logic
Regressed when attempting to share implementation of binary search.
2022-10-20 23:08:44 +09:00
Dean Herbert
26860a903e Refactor implementation to support hitobjects nested multiple levels deep 2022-10-20 22:30:30 +09:00
Dean Herbert
a754dc6d3b
Expose binary search methods publicly
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2022-10-20 14:34:07 +09:00
Dan Balasescu
fd7274095f
Merge pull request #20826 from peppy/fix-missing-beatmap-backgrounds
Fix some older beatmaps having missing backgrounds
2022-10-20 12:46:24 +09:00
Dean Herbert
cc311eef2a
Merge pull request #20834 from frenzibyte/fix-slider-ball-tint
Enable slider ball tint on "classic" skin
2022-10-20 12:34: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
2f8a4fd2d0
Merge branch 'master' into remove-current-item 2022-10-20 10:02:09 +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
39650717ea Improve input detection to not make cursor flicker on combined input 2022-10-20 03:45:25 +03:00
Salman Ahmed
4bf4938b72 Keep cursor hiding feature to gameplay screens for now 2022-10-20 03:44:58 +03:00
Salman Ahmed
eb386d4bd5 Enable slider ball tint in default legacy skin 2022-10-20 03:29:25 +03:00
Dean Herbert
a7d4a74ed6
Update osu.Game/Tests/Visual/ScrollingTestContainer.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-10-20 08:07:56 +09:00
Dean Herbert
78943a21d8
Update osu.Game/Beatmaps/ControlPoints/IControlPoint.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-10-20 08:06:05 +09:00
ansel
57320074a0 Fix accidental breakage of changelog layout 2022-10-20 01:24:36 +03:00
Dean Herbert
59e2478b0e Fix some older beatmaps having missing backgrounds
Closes https://github.com/ppy/osu/issues/20824.

Note that this will require a reimport of beatmaps as it is baked into the database. Probably not worth making a migration for at this point in time.
2022-10-19 16:01:10 +09:00
Joppe27
9b123e7365 Adjust flash intensity and fade values to feel better 2022-10-19 00:51:44 +02:00
Joppe27
a76a039722 Rename KiaiFlashingDrawable and move to osu.Game 2022-10-18 23:40:43 +02:00
Dean Herbert
d237c818f6 Fix nested objects in overlapping scrolling hit object container ruleset not using correct reference time 2022-10-18 16:15:21 +09:00
Dean Herbert
ec3761ced9 Standardise control point search logic in OverlappingScrollAlgorithm
Was using a very local algorithm which I cannot guarantee is correct.
I'd rather it just use the one used everywhere else.
2022-10-18 16:01:05 +09:00
Dean Herbert
fbad33bef7 Adjust durations and make start off screen 2022-10-18 15:01:53 +09:00
Dean Herbert
6b42f1931a Remove autosize easing in SettingsToolboxGroup
It just feels like unnecessary motion.
2022-10-18 15:01:26 +09:00
Dean Herbert
84688b53a1 Merge branch 'fix-editor-padding' into player-loader-improvements 2022-10-18 14:52:59 +09:00
Dean Herbert
860214c22a Adjust paddings to feel better now that backgrounds are visible of toolboxes 2022-10-18 14:38:45 +09:00
Dean Herbert
6a7f6c76ff Fix osu! editor padding being applied to toolboxes
The result of https://github.com/ppy/osu/pull/20739 and https://github.com/ppy/osu/pull/20738 having unintended side effects when applied together.
2022-10-18 14:32:00 +09:00
Dean Herbert
0f809dcaa7 Merge branch 'master' into player-loader-improvements 2022-10-18 14:22:55 +09:00
Dean Herbert
72be4940fd
Merge branch 'master' into comment-report 2022-10-18 13:52:33 +09:00
Dean Herbert
ccbac08985
Merge pull request #20593 from ekrctb/catch-editor-height
Allow arbitrary height catch editor
2022-10-18 12:10:49 +09:00
ansel
3258a41ca3 Merge branch 'comment-report' of https://github.com/Feodor0090/osu into comment-report 2022-10-17 20:41:46 +03:00
ansel
cd77ae062e Localize the button 2022-10-17 20:41:23 +03:00
ansel
797acf334f Show username in popup 2022-10-17 20:41:13 +03:00
Feodor0090
6efe7b5334
Merge branch 'master' into comment-report 2022-10-17 16:08:13 +03:00
ansel
ceb4d624b5 Delete wip form 2022-10-17 13:43:35 +03:00
ansel
ffa22d8a68 Update popover not to use labelled drawables 2022-10-17 13:42:17 +03:00
ansel
d7e5bcbd3c Add popover containers to overlays 2022-10-17 13:41:46 +03:00
Dean Herbert
516320edd9
Merge branch 'master' into handle-submitting-player-request-timeout 2022-10-17 18:51:13 +09:00
Dan Balasescu
4220d6b3fc
Merge pull request #20780 from outfoxxed/fix-hiterror-icons
Fix hit error bar icon orientation
2022-10-17 18:48:31 +09:00
ansel
7ed26369a3 Make a new report form, closer to web 2022-10-17 12:41:57 +03: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
Bartłomiej Dach
d0a495717e
Merge branch 'master' into comment-copy-link 2022-10-16 19:56:06 +02:00
ansel
4a8d976cb4 Use api's endpoint 2022-10-16 20:20:34 +03:00
ansel
e1785f73a2 Make report's comment not optional 2022-10-16 20:14:05 +03: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
ansel
ba595ab8fa Display toast instead of notification 2022-10-16 19:57:21 +03:00
ansel
9822a092c4 Add localization for enum 2022-10-16 19:50:55 +03: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
Salman Ahmed
1824b1deee
Merge branch 'master' into tablet-button-binding 2022-10-16 04:10:04 +03:00
Aki
91358f4a6a
Implement tablet button bindings 2022-10-15 15:16:14 +08:00
Salman Ahmed
324c749383
Merge branch 'master' into player-loader-improvements 2022-10-15 03:07:15 +03:00
Salman Ahmed
241ecb63a1 Hide manual input manager cursor in OsuGameTestScenes
Allows checking that the cursor is actually hidden in
`TestSceneOsuGame.TestCursorHidesWhenIdle`.
2022-10-15 00:20:22 +03:00
Salman Ahmed
06e6713237 Move mouse input detection inside MenuCursorContainer to allow testing 2022-10-15 00:20:22 +03:00
Salman Ahmed
ba72f13f54 Merge branch 'master' into hide-mouse-on-keyboard-input 2022-10-14 22:26:30 +03:00
Feodor0090
fb046e31c1
Merge branch 'master' into comment-report 2022-10-14 16:57:23 +03:00
ansel
dc0aa2295a Add test 2022-10-14 16:51:48 +03:00
ansel
3e9fd4c08c Implement reporting flow 2022-10-14 16:26:25 +03:00
ansel
7251d41deb Add request class 2022-10-14 16:15:28 +03:00
ansel
c65a8a83f3 Add basic UI for reporting 2022-10-14 15:52:09 +03:00
Dan Balasescu
10aabfc650
Merge pull request #20739 from peppy/settings-toolbox
Adjust visuals of settings toolboxes (gameplay loading screen and editor)
2022-10-14 20:31:05 +09:00
Dan Balasescu
dcb6357964 Add ability to remove the current item in multiplayer 2022-10-14 20:23:55 +09:00
Dean Herbert
32c3e35762 Change background colour to a lighter tint to avoid clash with slider bars 2022-10-14 19:38:27 +09:00
Dean Herbert
2404bb42b9 Use 10% alpha rather than 0% when toolbox is not hovered 2022-10-14 19:33:49 +09:00
Dan Balasescu
525f98c158 Fix max combo missing from playlists results screen 2022-10-14 18:01:54 +09:00
Salman Ahmed
01c65d3cc1 Remove seemingly unnecessary/leftover code 2022-10-14 02:16:36 +03:00
Salman Ahmed
739b21ab3b Maintain mod selection on ruleset change for common mods 2022-10-14 02:15:58 +03:00
ansel
8a47628fe1 Use spacer drawable instead of spacing on links container 2022-10-14 00:04:13 +03:00
ansel
295e6f5a68 Move toast to it's namespace 2022-10-13 23:57:25 +03:00
ansel
34ff072a9b Change text 2022-10-13 22:47:48 +03:00
ansel
a0cca391f6 Add copy link button to comments 2022-10-13 22:18:26 +03:00
ansel
e97dbf3dbc Move copy toast to its own file 2022-10-13 22:12:32 +03:00
Salman Ahmed
ef72b66dad Remove beatmap card background workaround to fix broken corners 2022-10-13 16:09:54 +03:00
Salman Ahmed
6c316bcc9e Make beatmap card icon buttons fill up to the area 2022-10-13 16:09:54 +03:00
Salman Ahmed
aa8040d696 Add hover box to beatmap card icon button 2022-10-13 16:09:54 +03: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
a93c350ca8 Start settings panels without background visible 2022-10-13 17:11:56 +09:00
Dean Herbert
6608ada925 Fix test failures due to missing colour provider dependency 2022-10-13 17:05:11 +09:00
Dean Herbert
15f9697c9f Roughly update design of editor buttons 2022-10-13 16:57:25 +09:00
Dean Herbert
4d99c7002b Add background behind editor toolbox groups 2022-10-13 16:36:19 +09:00
Dean Herbert
0f4a2a6059 Improve feel of settings toolbox group 2022-10-13 16:36:19 +09:00
Dean Herbert
c3902728f6 Reorganise beatmap snap control to work better in compact mode 2022-10-13 15:47:54 +09:00
Dean Herbert
a525b3f9f8 Reorder and rename toggle checkboxes to fit better 2022-10-13 15:44:33 +09:00
Dean Herbert
f6f5d33f53 Add slight padding to playfield (roughly matches stable) 2022-10-13 15:44:23 +09:00
Dan Balasescu
338115ff6a Move check to LegacyDifficultyControlPoint 2022-10-13 15:05:15 +09:00
Dean Herbert
ebc1088457
Merge pull request #20729 from frenzibyte/update-local-confirmation-dialog
Request user confirmation on updating locally-modified beatmaps
2022-10-13 12:36:37 +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
f573ee4521
Merge pull request #20512 from Feodor0090/comment-deletion
Add ability to delete own comments
2022-10-13 12:13:08 +09:00
Dean Herbert
e240f659c2 Refactor visibility states to read better 2022-10-13 11:22:40 +09:00
Dan Balasescu
565e5586fd
Merge pull request #20725 from peppy/fix-beatmap-skin-fallbakcs
Fix legacy fallbacks not working correctly for beatmap skins
2022-10-13 10:08:40 +09:00
Salman Ahmed
964ed01abb Add confirmation dialog for updating locally modified beatmaps 2022-10-13 02:40:15 +03:00
Salman Ahmed
4fb156ef4e Update xmlodc and add nullability attributes 2022-10-13 00:16:42 +03:00
Salman Ahmed
6199db11a2 Make OsuUserInputManager dependency nullable for tournament client 2022-10-12 17:55:32 +03:00
Salman Ahmed
7a6ecaff0d Remove default invisible cursor container from rulesets 2022-10-12 17:50:47 +03:00
Salman Ahmed
a44cfe2901 Hide menu cursor when user is idle 2022-10-12 17:50:31 +03:00
Salman Ahmed
8305d886e6 Refactor internal visibility logic to route back to PopIn/PopOut 2022-10-12 17:50:04 +03:00
Dean Herbert
19f3810020 Revert namespace change
Let's not
2022-10-12 18:50:47 +09:00
Dean Herbert
3da54814f8
Merge pull request #20641 from pfgithub/patch-fix-save-collections
Preserve collections when saving a beatmap
2022-10-12 18:36:45 +09:00
sw1tchbl4d3
df0501235d Introduce BpmMultiplierMania, remove after the fact clamps 2022-10-12 11:14:01 +02:00
Dean Herbert
8bf4ca4b53 Add legacy skin fallback when beatmap skin is providing resources 2022-10-12 17:47:20 +09:00
Dean Herbert
fd20515a6d Don't throw if LegacySkin doesn't have a transformer encapsulating it
This allows for more flexibility in lookups.
2022-10-12 17:29:17 +09:00
Dean Herbert
1c93551590 Remove completely incorrect check before applying ruleset transformer 2022-10-12 17:07:13 +09:00