1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 19:32:58 +08:00
Commit Graph

36503 Commits

Author SHA1 Message Date
mk56-spn
0aba119056 Merge remote-tracking branch 'origin/RangeSlider_implementation' into RangeSlider_implementation
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeFilterControl.cs
#	osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
2022-11-27 10:40:29 +01:00
Jai Sharma
218c04c174 Code quality 2022-11-27 03:23:08 +00:00
Jai Sharma
6000e14668 Correctly select issue row 2022-11-27 03:08:54 +00:00
Jai Sharma
3c56b9c93a Add OnRowSelected event to EditorTable 2022-11-27 02:47:54 +00:00
Jai Sharma
792334a190 Move Control Group timing data into it's own component 2022-11-27 02:47:02 +00:00
Jai Sharma
b6d7bec240 Remove #nullable disabled from EditorTable and it's derived classes 2022-11-27 02:45:56 +00:00
Jai Sharma
1a914d0df7 Remove #nullable disable from TimingScreen 2022-11-27 02:43:22 +00:00
cdwcgt
e16f8a4410
Merge branch 'master' into NowPlaying 2022-11-27 08:48:49 +08:00
cdwcgt
02e3ebe1a0
DifficultyIncrease use + and other all -
mod.Name to mod.Acronym
2022-11-27 09:44:09 +09:00
cdwcgt
653875bbb4
only post mod when ingame 2022-11-27 09:41:41 +09:00
cdwcgt
8ecb4aa30b
better method name 2022-11-27 09:41:08 +09:00
Bartłomiej Dach
fd16e5992b
Merge branch 'master' into triangles-fix 2022-11-26 19:28:55 +01:00
Dean Herbert
d1eedd081c Update resources 2022-11-27 02:46:11 +09:00
Andrei Zavatski
7ab5136e12 Compute texel size in the DrawNode 2022-11-26 20:05:34 +03:00
Bartłomiej Dach
c42720acd4
Temporarily disable "partial class with one part" inspection 2022-11-26 18:05:08 +01:00
Bartłomiej Dach
212d78865a
Add a few more missing partial specs 2022-11-26 16:30:52 +01:00
Bartłomiej Dach
894ef15e79
Merge branch 'master' into update-framework 2022-11-26 16:19:36 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dean Herbert
a1c559ae05 Update framework 2022-11-27 00:00:12 +09:00
mk56-spn
92ed2ed4ef Refactor star "DifficultyRangeFilterControl" into generic range slider class 2022-11-26 12:19:08 +01:00
Bartłomiej Dach
ca0597b38e
Merge branch 'master' into dont-change-ruleset-convert 2022-11-25 19:23:36 +01:00
Bartłomiej Dach
73176a1315
Merge branch 'master' into triangle-button-v2 2022-11-25 18:35:59 +01:00
Bartłomiej Dach
bbbc1d0428
Darken colour of playlists create button
To match d0c4637683.
2022-11-25 18:23:28 +01:00
cdwcgt
13f86f3e53
Merge branch 'master' into NowPlaying 2022-11-25 23:22:52 +09:00
cdwcgt
a2ea7a3f58
show selected mod and use ILocalisedBindableString in np 2022-11-25 23:20:44 +09:00
Dean Herbert
5ada9efa60 Update outdated comment regarding colour choices 2022-11-25 22:10:20 +09:00
Dean Herbert
76e9382e0b Fix triangles showing on ExpandableButtons when in contracted state 2022-11-25 20:18:35 +09:00
Dean Herbert
d0c4637683 Lighten colour of multiplayer create game button 2022-11-25 20:18:21 +09:00
Dean Herbert
b0f14d4963 Clamp AimCount to ensure at least one triangle is spawned 2022-11-25 20:14:21 +09:00
Dean Herbert
4cb068ceb9 Change AimCount to not consider height 2022-11-25 20:10:04 +09:00
Dean Herbert
25410c9962 Avoid changing ruleset when presenting a beatmap if it can be converted
Closes #21415.
2022-11-25 19:48:01 +09:00
Derrick Timmermans
65e5c9a3ae
Dispose DrawableRulesetDependencies in HitObjectComposer 2022-11-25 08:27:22 +01:00
Bartłomiej Dach
fca3e7e39f
Merge branch 'master' into editor-seek-control-points 2022-11-24 21:53:47 +01:00
Dean Herbert
f6e229c24d "Fix" mod copy failure 2022-11-25 01:15:11 +09:00
Dean Herbert
2b2beadd06 Merge branch 'master' into update-framework 2022-11-25 01:00:08 +09:00
Derrick Timmermans
7b620392fe
Provide DrawableRulesetDependencies from HitObjectComposer 2022-11-24 13:13:45 +01:00
Dean Herbert
6ad432b311 Use RoundedButton in more places 2022-11-24 16:33:01 +09:00
Dean Herbert
53b03df93d Combine TriangleButton and RoundedButton classes 2022-11-24 16:26:57 +09:00
Dean Herbert
bea2acc60e Remove local specifications of triangle colouring 2022-11-24 16:18:15 +09:00
Dean Herbert
4fbca4037c Update existing triangle buttons to use RoundedButton 2022-11-24 16:18:15 +09:00
Dean Herbert
40f706155f Update RoundedButton to have new triangles design 2022-11-24 16:18:15 +09:00
Dean Herbert
44a71741e4
Merge pull request #21225 from EVAST9919/triangles-v2
Implement TrianglesV2 component
2022-11-24 16:15:25 +09:00
Dean Herbert
8914a871c1
Merge pull request #21065 from C0D3-M4513R/beatmap-info
Add Beatmap Information elements
2022-11-24 15:22:04 +09:00
Dean Herbert
2e277ef40a Update resources 2022-11-24 15:18:49 +09:00
Dean Herbert
a2438428a2 Move base call to end 2022-11-24 13:57:43 +09:00
Dean Herbert
37f725bfa2 Reverse directionality of up/down traversal keys to match scroll 2022-11-24 13:55:58 +09:00
C0D3 M4513R
4b44f31b5e
Use LocaliseableStings in BeatmapAttributeText 2022-11-23 21:02:43 +01:00
Bartłomiej Dach
2f67199b1c
Merge branch 'master' into fix-missing-day-separator 2022-11-23 18:40:44 +01:00
Bartłomiej Dach
60422be9af
Merge branch 'master' into fix-editor-tap-timing-crash 2022-11-23 17:51:50 +01:00
Dean Herbert
b381b4fd2d Merge branch 'master' into update-framework 2022-11-24 01:27:58 +09:00
Dean Herbert
3acf15c7b8 Update framework 2022-11-24 01:26:49 +09:00
Bartłomiej Dach
30f9cc46a7
Protect offset and bpm adjustments from null selection too 2022-11-23 17:25:43 +01:00
Bartłomiej Dach
508f1f488c
Merge branch 'master' into limit-barline-generation-sanity 2022-11-23 17:12:36 +01:00
Dean Herbert
5467097387 Fix adjacent day separators potentially being left behind after pending message resolution 2022-11-23 18:49:51 +09:00
Dean Herbert
f9d952220f Fix barlines being misaligned if generation start time is clamped 2022-11-23 18:12:03 +09:00
Dean Herbert
774f70e380 Simplify class structure 2022-11-23 16:56:40 +09:00
Dean Herbert
0749a7bb07 Simplify attribute assignment 2022-11-23 16:53:36 +09:00
Dean Herbert
0f034606fd Use LocalisableDescription from BeatmapOnlineStatus enum instead of locally defined 2022-11-23 16:49:51 +09:00
Dean Herbert
a8af83e62a Move label initialisation out of ctor 2022-11-23 16:49:39 +09:00
Dean Herbert
27473262af Rename attributes in enum to match better with user expectations 2022-11-23 16:45:46 +09:00
Dean Herbert
b89689a34a Rename class and reword settings text/tooltips to avoid clashing with other naming 2022-11-23 16:31:50 +09:00
Dean Herbert
a9192c32ea Merge branch 'master' into beatmap-info 2022-11-23 16:10:12 +09:00
Dean Herbert
9b9b8a5977 Add ability to seek between control points in editor using down/up arrows
Matches stable. Addresses #21376.
2022-11-23 15:59:32 +09:00
Dean Herbert
d146f86511 Fix crash when hitting 'T' to tap timing while no timing point is selected 2022-11-23 15:39:56 +09:00
Dean Herbert
172e798847
Merge pull request #21228 from Terochi/recent-messages-implementation
Add ability to view chat send history in input box
2022-11-23 14:58:42 +09:00
Bartłomiej Dach
8dbc38e17a
Remove unused setter 2022-11-22 20:14:22 +01:00
Bartłomiej Dach
76bb529cfa
Add test for local echo adding day separator 2022-11-22 16:46:21 +01:00
Dean Herbert
de163b2bb5 Change song select to only allow volume adjusting if alt is held while scrolling 2022-11-22 19:48:55 +09:00
Alden Wu
a2b505f4c0 Use a direct Lighten instead of >1f Color4 values 2022-11-22 00:31:22 -08:00
Dean Herbert
1632df1f4d Update DifficultyBindable to match new bindable spec 2022-11-22 14:51:19 +09:00
Dan Balasescu
985781bc3b
Merge pull request #21356 from peppy/standardise-broken-storyboard-paths
Add support for storyboards with incorrect path specifications (`\\` instead of `\`)
2022-11-22 14:33:51 +09:00
Alden Wu
4084a2b066 Highlight ChatLine username on hover 2022-11-21 18:57:59 -08:00
Bartłomiej Dach
8dbe31a172
Merge branch 'master' into higher-aspect-ratio-max 2022-11-21 19:51:39 +01:00
Bartłomiej Dach
c0f65d83b3
Merge branch 'master' into hide-no-spin-bonus 2022-11-21 19:14:54 +01:00
Bartłomiej Dach
206aece77b
Merge branch 'master' into avoid-null-audio-device-name-crahs 2022-11-21 16:37:13 +01:00
Bartłomiej Dach
7944d9cefa
Merge pull request #21304 from EVAST9919/beatmap-bar
Rework BarGraph to use Quads
2022-11-21 16:24:18 +01:00
Terochi
d81ef541bc Variant 5: cannot change history, edit resets index 2022-11-21 10:17:28 +01:00
Terochi
7dc7729ac2 Variant 4: cannot change history, empty text/everything selected resets index (current with bug fix) 2022-11-21 10:11:26 +01:00
C0D3 M4513R
93ab1c9432
Merge branch 'master' into beatmap-info 2022-11-21 09:01:24 +00:00
Terochi
58288275a6 Variant 3: cannot change history, cannot reset index (the "default") 2022-11-21 09:43:36 +01:00
Terochi
672e1cd45b Variant 2: edit changes history, cannot reset index (similar to stable) 2022-11-21 09:41:29 +01:00
Terochi
8f942f130b Variant 1: edit changes history, empty text resets index 2022-11-21 09:36:31 +01:00
Andrei Zavatski
ec8532951c Make Thickness property auto 2022-11-21 10:32:19 +03:00
Dean Herbert
2774c1ea49
Merge pull request #21215 from jai-x/triangles-bundled-beatmap
Add winner of Triangles mapping competition as a bundled beatmap
2022-11-21 16:22:23 +09:00
Andrei Zavatski
14a4de36f4 Expose thickness property 2022-11-21 10:20:35 +03:00
Dean Herbert
3da21e596a Add support for storyboards with incorrect path specifications (\\ instead of \)
Closes https://github.com/ppy/osu/issues/21204.
2022-11-21 16:12:01 +09:00
Dean Herbert
462a213ffc Add TODO note about handling initial silences 2022-11-21 15:23:04 +09:00
Dean Herbert
efd73ea9da Rename method to suit better 2022-11-21 15:22:57 +09:00
Dean Herbert
5c640d15a0 Stop requesting messages as part of initial chat presence 2022-11-21 15:17:54 +09:00
Dean Herbert
9a330c3cdb Apply nullability and clean up conditionals 2022-11-21 15:02:45 +09:00
Dean Herbert
a07b033d22
Merge branch 'master' into triangles-v2 2022-11-21 14:55:01 +09:00
Dean Herbert
981264b011 Avoid crashing when a system audio device provides a null name 2022-11-21 14:51:41 +09:00
Dean Herbert
40f2da364c Limit how far before the first hitobject that barlines can be generated 2022-11-21 14:40:25 +09:00
Dean Herbert
93a189603a Hide spinner ticks / bonus from results screen when not applicable to score 2022-11-21 14:20:36 +09:00
Dean Herbert
4a79141824
Merge pull request #21338 from RATCM/fix-leaderboard-filter
Match leaderboard filter behaviour to web
2022-11-21 14:01:55 +09:00
Dean Herbert
e53b4321ff Ensure two day separators are not added in a row 2022-11-21 14:01:10 +09:00
Dean Herbert
fa7b45dfb1 Fix chat day separator not being added on pending message resolution
Closes #21316.
2022-11-21 13:52:14 +09:00
Dean Herbert
dfa92b3de9
Merge pull request #21326 from bdach/fix-phantom-beatmap-sets
Fix phantom beatmap sets appearing on carousel after delete/update
2022-11-21 13:25:14 +09:00
Dean Herbert
c7ae837687 Increase maximum aspect ratio for tablet settings to 23:9 / 2.55 2022-11-21 12:45:54 +09:00
Dean Herbert
92aea22cd3
Merge pull request #21340 from vegguid/MetadataLanguage-FirstSetup
Added PreferOriginalMetadataLanguage to FirstRunSetup
2022-11-21 12:16:56 +09:00
vegguid
a431b793b9 Added PreferOriginalMetadataLanguage to FirstRunSetup 2022-11-20 23:18:19 +01:00
Andrei Zavatski
18c79dfda3 Move all the logic into BarsInfo class 2022-11-20 23:00:13 +03:00
RATCM
f5fbb7c8de Changed comments 2022-11-20 19:27:40 +01:00
RATCM
d20a357c0e Fixed ordering bug 2022-11-20 19:24:51 +01:00
RATCM
9040dfbd4e Match leaderboard filter behaviour to web 2022-11-20 17:39:46 +01:00
Bartłomiej Dach
1269afd0c5
Merge pull request #21307 from frenzibyte/disable-scroll-speed-on-osu
Hide scroll speed control from effects section on rulesets which don't support it
2022-11-20 16:17:55 +01:00
Bartłomiej Dach
0f382590e6
Remove unnecessary #nullable disable 2022-11-20 15:31:51 +01:00
Bartłomiej Dach
33b2fe46d9
Add xmldoc to HistoryTextBox 2022-11-20 12:29:47 +01:00
Bartłomiej Dach
7b274083d3
Fix phantom beatmap sets appearing on carousel after delete/update
Regressed in c40c70509e.

As it turns out, `item.Item.Filtered.Value` is not the only condition
that should be checked to determine if a carousel item should be hidden
or not - `item.Item.State.Value != CarouselItemState.Collapsed` should
also be true. This was even available as the `item.Item.Visible`
convenience property, which is used in this commit.

Failing to check `item.Item.State.Value` led to setting non-zero alpha
on collapsed carousel items, leading to phantom beatmap sets appearing,
as the alpha was set in the entire carousel's `Update()` method, thus
firing every frame.
2022-11-20 10:08:34 +01:00
Andrei Zavatski
36141cb2a4 Make BarsInfo a class 2022-11-20 05:14:07 +03:00
Salman Ahmed
4b0ba86bd0 Identify scrolling rulesets using temporary DrawableRuleset instances 2022-11-20 04:12:52 +03:00
Salman Ahmed
58296bd4f0 Introduce IDrawableScrollingRuleset for editor consumption 2022-11-20 04:11:10 +03:00
Andrei Zavatski
fcb52ee237 Make BarsInfo a readonly struct 2022-11-20 02:28:07 +03:00
Andrei Zavatski
fbfcf49ea6 Remove readonly modifier from struct fields 2022-11-20 02:13:54 +03:00
Andrei Zavatski
2cb966b47c Rework BarsInfo struct 2022-11-20 01:48:54 +03:00
Andrei Zavatski
6c62cfb830 Store barBreadth as a separate float 2022-11-19 23:40:02 +03:00
Andrei Zavatski
67ee9f3915 Naming adjustments 2022-11-19 23:34:55 +03:00
Andrei Zavatski
f1201454b7 Use value tuples 2022-11-19 23:29:50 +03:00
Andrei Zavatski
6f449a583e Handle empty values as a separate case 2022-11-19 23:27:48 +03:00
Terochi
eff6c7be64 Removed unnecessary methods, changed tests, and moved LimitedCapacityQueue.cs to a more generic namespace. 2022-11-19 16:53:35 +01:00
Bartłomiej Dach
0c671a2a82
Merge branch 'master' into fix-tablet-aspect-ratio-values 2022-11-19 14:32:24 +01:00
Bartłomiej Dach
c05c1625f2
Merge branch 'master' into editor-test-play-dont-retain-test-time 2022-11-19 12:09:04 +01:00
Salman Ahmed
60c424837b
Merge branch 'master' into disable-scroll-speed-on-osu 2022-11-19 12:13:45 +03:00
Salman Ahmed
2e3af97892 Remove unused using 2022-11-19 12:13:36 +03:00
Andrei Zavatski
0239103b6b Fix BeatmapOverlay crashing test scene 2022-11-19 11:33:14 +03:00
Andrei Zavatski
05992d3aa8 CI fix 2022-11-19 10:23:37 +03:00
Andrei Zavatski
9b8f98735c Use struct for bars description 2022-11-19 10:16:58 +03:00
Andrei Zavatski
7d02cbafed Merge branch 'master' into beatmap-bar 2022-11-19 09:58:10 +03:00
Andrei Zavatski
11f5fddc1f Remove redundant returns 2022-11-19 09:57:52 +03:00
Dean Herbert
130f776427
Merge pull request #21267 from peppy/catch-file-enumeration-errors
Catch and gracefully handle file/directory enumeration failures during stable import
2022-11-19 15:38:40 +09:00
Salman Ahmed
290369db47 Hide scroll speed slider on rulesets which don't support it 2022-11-19 06:42:27 +03:00
Salman Ahmed
016de2f5a0 Fix editor not always playing hitsounds with clock offsets applied 2022-11-19 05:15:22 +03:00
Andrei Zavatski
e8ca9f5dc5 Rework BarGraph to use Quads 2022-11-19 00:22:57 +03:00
Salman Ahmed
1be8c6bd9c Fix "perform from screen" not considering screen load state 2022-11-18 17:23:10 +03:00
Dawid Sośnia
9ad484a0f4
Merge branch 'ppy:master' into gameplay-leaderboard-fix 2022-11-18 12:11:22 +01:00
Dean Herbert
06ce8130c2 Apply changes in line with framework NRT updates 2022-11-18 18:13:15 +09:00
Dean Herbert
95908ec023 Update framework 2022-11-18 18:13:00 +09:00
Dan Balasescu
e4fc14faee
Merge pull request #21270 from peppy/auto-advance-bindings
Auto-advance binding for ruleset key bindings
2022-11-18 16:19:54 +09:00
Dan Balasescu
9d33a6568e
Merge pull request #21292 from peppy/fix-binding-two-keys-single-binding
Fix being able to bind two non-modifier keys to the same binding
2022-11-18 16:19:38 +09:00
Dan Balasescu
d8e99d811d
Merge pull request #21293 from frenzibyte/fix-timeline-extent-scrolling
Fix timeline potentially scrolling at extents while not dragging
2022-11-18 16:19:30 +09:00
Dean Herbert
d59befc9d3 Fix initial visual state of positions before sort runs 2022-11-18 16:08:27 +09:00
Dean Herbert
aff218dfd5 Redirect through validity function rather than overriding Sort 2022-11-18 16:03:40 +09:00
Dean Herbert
20af8217f4 Tidy up bindable flow 2022-11-18 15:50:41 +09:00
Dean Herbert
e4f522aad1 Fix inspections / typos 2022-11-18 15:47:37 +09:00
Dean Herbert
d17c091d63 Move constant to a better location 2022-11-18 15:47:31 +09:00
Dean Herbert
3faa7f5f74
Merge branch 'master' into gameplay-leaderboard-fix 2022-11-18 15:44:30 +09:00
Salman Ahmed
90cd386323 Fix timeline potentially scrolling at extents while not dragging 2022-11-18 09:43:16 +03:00
Dean Herbert
bab5be8dee
Merge pull request #21290 from smoogipoo/multiplayer-test-debug
Add some debugging for multiplayer test failures
2022-11-18 15:39:33 +09:00
Dean Herbert
e658efbefa Fix being able to bind two non-modifier keys to the same binding 2022-11-18 15:34:41 +09:00
Dan Balasescu
c2a127dc68
Merge pull request #21289 from peppy/fix-triangle-button-flash
Fix triangle button flash effect looking incorrect
2022-11-18 15:26:43 +09:00