1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 02:17:25 +08:00
Commit Graph

36453 Commits

Author SHA1 Message Date
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
Dan Balasescu
219d049edf
Merge pull request #21140 from maromalo/long-standard
Standardise scores to `long` type
2022-11-18 15:26:33 +09:00
Dan Balasescu
cc434c9113
Merge pull request #21288 from peppy/fix-no-network-slow-gameplay-load
Fix entering gameplay while network connection is in a bad state taking too long
2022-11-18 15:24:31 +09:00
Dan Balasescu
7e9d2ecaf5
Merge pull request #21287 from peppy/fix-null-ref-persistent-endpoint-connector
Fix potential incorrect connection state resulting in null reference
2022-11-18 15:08:33 +09:00
Dan Balasescu
b0faa009c1 Add some debugging for multiplayer test failures 2022-11-18 14:52:11 +09:00
Dean Herbert
5fc0d45675 Fix triangle button flash effect looking incorrect 2022-11-18 14:30:59 +09:00
Dan Balasescu
57b8495c7a Merge branch 'master' into long-standard 2022-11-18 14:24:04 +09:00
Dan Balasescu
d47c46d144 Compute raw score in-line
Saves on an allocation (though it seems to only be a ValueType so it
shouldn't be a big deal) and a tail-call.
2022-11-18 14:22:28 +09:00
Dean Herbert
964ceddf83 Fix API queue only being flushed once while in a failing state 2022-11-18 14:21:37 +09:00
Dean Herbert
e4d134a820 Reduce time waited on a score submission token from 60 to 30s 2022-11-18 14:07:40 +09:00
Dan Balasescu
1b1fed723d
Merge pull request #21269 from peppy/fix-key-bindings-keyword
Move "keybindings" keyword to correct section
2022-11-18 14:05:08 +09:00
Dan Balasescu
551192b413 Refactor a bit for readability 2022-11-18 13:55:37 +09:00
Dean Herbert
a5d22195f2 Fix potential incorrect connection state resulting in null reference 2022-11-18 13:45:46 +09:00
Dean Herbert
1ff1738988
Merge pull request #21244 from nanashi-1/beatmapoptions-disabled
Disable certain beatmap option buttons when there are no beatmaps selected
2022-11-18 12:55:07 +09:00
Dan Balasescu
a776622ce0
Merge pull request #21284 from peppy/now-playing-overlay-texture-reduction
Fix `NowPlayingOverlay` loading background texture too early (and permanently)
2022-11-18 12:09:16 +09:00
Dan Balasescu
c34dd27674
Merge pull request #21276 from peppy/eager-triangles-disposal
Eagerly dispose of triangles intro textures to avoid holding for full length of game session
2022-11-18 11:58:39 +09:00
Dan Balasescu
baa4fd56e2
Merge pull request #21279 from peppy/news-load-unload
Fix news post images never unloading from memory after first display
2022-11-18 11:56:13 +09:00
Dan Balasescu
13fe0d3491
Merge pull request #21278 from peppy/overlay-header-texture-reduction
Avoid loading overlay headers until first open
2022-11-18 11:53:46 +09:00
Dean Herbert
b53f9baf6a Fix NowPlayingOverlay loading background texture too early (and permanently) 2022-11-18 11:21:12 +09:00
Dean Herbert
93c2280754 Fix supporter filters text not being set correctly 2022-11-18 10:35:05 +09:00
Dawid Sośnia
0dbf491872
Merge branch 'master' into gameplay-leaderboard-fix 2022-11-17 22:06:51 +01:00
Piggey
eb691266c1 cleanup 2022-11-17 21:50:39 +01:00
Dean Herbert
b37e9c0266 Fix news post images never unloading from memory after first display 2022-11-18 00:01:53 +09:00
Dean Herbert
73e4827d36 Avoid loading overlay headers until first open
Also switches them to use non-atlased target as they won't benefit much
from atlasing.
2022-11-17 23:55:43 +09:00
Dean Herbert
63c1855511 Avoid loading beatmap listing placeholders until required 2022-11-17 23:42:21 +09:00
Dean Herbert
a3e8cc1663 Mark beatmap listing placeholder textures as large 2022-11-17 23:41:35 +09:00
Dean Herbert
20d87fbed4 Eagerly dispose of triangles intro textures to avoid holding for full length of game session 2022-11-17 23:05:34 +09:00
Piggey
fa00fc5c6d change scoresType to be a bindable 2022-11-17 13:27:56 +01:00
Dragon
a25c94d567 Replacing structure to use LimitedCapacityQueue.cs 2022-11-17 13:07:06 +01:00
Dragon
a9747d367c Cleaning up 2022-11-17 13:07:06 +01:00
Terochi
0100c01b82 Implemented finite limit of stored history. 2022-11-17 13:07:06 +01:00
Terochi
5253f5309e Added more tests for new features 2022-11-17 13:07:06 +01:00
Terochi
44c3e71746 Reversed indexing 2022-11-17 13:07:06 +01:00
Terochi
3d4962e181 Added functioning tests. 2022-11-17 13:07:06 +01:00
Terochi
6d83af01e2 Moved and renamed MessageHistoryTextBox.cs for better fit. 2022-11-17 13:07:06 +01:00
Dragon
b9590320b7 Moved implementation to ChatRecentTextBox.cs and derived ChatTextBox.cs and StandAloneChatDisplay.cs from it. 2022-11-17 13:07:06 +01:00
Dragon
a1af663682 Implemented previous messages lookup in the ChatTextBox.cs 2022-11-17 13:07:06 +01:00
Piggey
dea2a6ed8d override sort() function in SoloGameplayLeaderboard 2022-11-17 12:12:36 +01:00
nanashi-1
4773979e52 add condition 2022-11-17 16:15:34 +08:00
Dean Herbert
d1b2116400 Auto-advance binding for ruleset key bindings 2022-11-17 15:23:20 +09:00
Dean Herbert
bd2e0dc82b Move "keybindings" keyword to correct section
Without this, things like tablet settings would show when searching for
bindings, even though these settings have nothing to do with key
bindings.
2022-11-17 15:09:42 +09:00
Dan Balasescu
5ceb7ecc41
Remove unused using 2022-11-17 13:56:27 +09:00
Dean Herbert
1050d7da34 Use more generic exception type (issue reported AggegateException) 2022-11-17 13:36:16 +09:00
Dean Herbert
adab9f0e48 Catch and gracefully handle file/directory enumeration failures during stable import
Closes https://github.com/ppy/osu/issues/21214.
2022-11-17 13:34:42 +09:00
Dean Herbert
a4e713a61f When returning to the editor after test play, use the original editor time rather than the point of exit 2022-11-17 12:36:24 +09:00
Dean Herbert
bfcd9e0f45 Don't seek to current editor location when location is close to (or before) the first object 2022-11-17 12:32:35 +09:00
Dan Balasescu
bdfc317a8e
Merge pull request #21255 from peppy/fix-full-area-reset
Fix "reset to full area" button not always working correctly
2022-11-17 11:13:06 +09:00
Dan Balasescu
b23b5ebce9
Merge pull request #21257 from peppy/fix-test-mode
Fix combo colour normalisation setting not applying to editor test play
2022-11-17 10:44:44 +09:00
Salman Ahmed
87b4fee10f Remove leftover constant 2022-11-17 04:05:21 +03:00
Salman Ahmed
55beaf5d93 Revert buttons order change 2022-11-17 04:05:15 +03:00
Salman Ahmed
039ab83a46 Disable beatmap options button when none selected 2022-11-17 04:00:23 +03:00