1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 03:52:55 +08:00
Commit Graph

36622 Commits

Author SHA1 Message Date
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
Salman Ahmed
0e46614c57 Revert beatmap option button state changes 2022-11-17 03:57:01 +03:00
Salman Ahmed
c1673771eb
Merge branch 'master' into fix-full-area-reset 2022-11-17 01:57:56 +03:00
Salman Ahmed
7a28a7f2a0 Move IGameplaySettings override to compose screen to keep test mode unaffected 2022-11-17 01:45:16 +03:00
Andrei Zavatski
13cf3fc40c Make SpawnRatio public 2022-11-16 15:17:50 +03:00
Andrei Zavatski
cc4f05f3d3 Replace Scale with SpeedMultiplier 2022-11-16 15:12:57 +03:00
Andrei Zavatski
109aa37dd8 Apply fixes from original Triangles 2022-11-16 15:02:09 +03:00
Andrei Zavatski
d94c624ee4 Merge branch 'master' into triangles-v2 2022-11-16 14:53:32 +03:00
Dean Herbert
ee6fffec5f Fix combo colour normalisation setting not applying to editor test play 2022-11-16 17:54:49 +09:00
Dean Herbert
bb762d8131 Fix "reset to full area" button not always working correctly 2022-11-16 15:45:26 +09:00
nanashi-1
5d8d8ffce5 fix naming 2022-11-16 10:09:51 +08:00
nanashi-1
55edd6c907 add space 2022-11-16 09:58:49 +08:00
nanashi-1
1fb8357e93 change disabledAlpha from readonly to const 2022-11-16 09:58:32 +08:00
nanashi-1
9101ad0cbd fixed naming 2022-11-16 09:42:40 +08:00
Dean Herbert
52ecd894db Move equilateral triangle ratio to constant 2022-11-15 22:20:08 +09:00
nanashi-1
5973bb1956 AddButton now returns the button 2022-11-15 20:57:31 +08:00
nanashi-1
1186ed3e32 add disable 2022-11-15 20:56:18 +08:00
nanashi-1
e8d170e772 disable certain options when no beatmap is selected 2022-11-15 20:55:55 +08:00
Andrei Zavatski
f27a5f977d Improve triangles distribution 2022-11-15 11:49:53 +03:00
Andrei Zavatski
c7dc6db124 Fix incorrect number of added triangles 2022-11-15 11:32:05 +03:00
Andrei Zavatski
ebff844334 Reset triangles on scale change 2022-11-15 11:06:28 +03:00
Dean Herbert
489dca79a1 Remove upper limit for pooling 2022-11-15 12:31:25 +09:00
Dean Herbert
308ed1abd1 Fix number of judgements shown potentially exceeding upper limit 2022-11-15 12:31:25 +09:00
Dean Herbert
59a8603728 Ensure flowing animation starts correctly from zero 2022-11-15 12:04:40 +09:00
Dean Herbert
aef6ee23eb Apply pooling support to ColourHitErrorMeter 2022-11-15 12:04:40 +09:00
Dean Herbert
a86b50d62a Apply nullability to BarHitErrorMeter 2022-11-15 11:33:27 +09:00
Dean Herbert
576f462f59 Add pooling support to BarHitErrorMeter 2022-11-15 11:33:27 +09:00
Dan Balasescu
e43593a164
Merge pull request #21227 from Susko3/fix-FallbackSampleStore-async-fallback-logic
Fix `FallbackSampleStore.GetAsync` fallback logic
2022-11-14 10:17:42 +09:00
Susko3
56fd1f95b1 Fix FallbackSampleStore.GetAsync fallback logic 2022-11-13 18:47:28 +01:00
Joseph Madamba
4578a96813 Fix beatmap card expanded content not blocking clicks from behind 2022-11-13 08:18:44 -08:00
Andrei Zavatski
81c9ea98e2 Implement TrianglesV2 component 2022-11-13 15:31:48 +03:00
Dean Herbert
efe42f701a Merge branch 'master' into only-rounded-shader 2022-11-13 16:34:48 +09:00
Dean Herbert
236cc0bdaf Update resources 2022-11-13 16:21:28 +09:00
Dean Herbert
887b6832c9 Update framework 2022-11-13 16:15:30 +09:00
Dean Herbert
eae8530722 Fix SkinnableSprite lookups broken in lazer-first skins
Regressed with removal of local `GetTexture` calls in e19ba65f91
2022-11-13 12:46:21 +09:00
Jai Sharma
c5cb4e4e7d Add winner of Triangles mapping competition as a bundled beatmap
https://osu.ppy.sh/home/news/2022-10-06-results-triangles
2022-11-12 17:48:40 +00:00
Dean Herbert
f343ba6111 Add xmldoc for chat ack request 2022-11-13 00:10:06 +09:00
Dean Herbert
22d8a1160e Fix last silence ID being updated too often, causing most silences to be missed 2022-11-13 00:10:06 +09:00
Dean Herbert
143c946128 Simplify ack re-perform flow 2022-11-12 23:02:37 +09:00
Dean Herbert
bfb939cbd0 Expand on why call needs to be made every 10 minutes 2022-11-12 22:24:27 +09:00
Dean Herbert
6a3665a6fd Remove excess logging on WebSocketNotificaitonsClient 2022-11-12 22:09:27 +09:00
maromalo
1911120afe
Merge branch 'master' into long-standard 2022-11-12 09:52:11 -03:00
Dean Herbert
ace4099079 Update ack code after incorrect merge 2022-11-12 21:41:10 +09:00
Thomas Müller-Höhne
9ef43ebd83 Fix compilation after framework-side PR updates 2022-11-12 21:24:12 +09:00
Dean Herbert
dde09d409b Merge branch 'master' into chat-silences 2022-11-12 21:00:56 +09:00
Thomas Müller-Höhne
fa8e38d9d6 Target rounded fragment shader
Compatibility with osu-framework change https://github.com/ppy/osu-framework/pull/5512
2022-11-12 17:18:23 +09:00
Samaoo
4ff17cb4bd remove unused using directive 2022-11-12 08:52:33 +01:00
Samaoo
7a860fb460 address reviews 2022-11-12 08:49:03 +01:00
Samaoo
268011be9e use MathF 2022-11-11 17:56:50 +01:00
Samaoo
173f557376 fix tablet aspect ratio values 2022-11-11 17:14:34 +01:00
Dean Herbert
19876ca0fb
Merge branch 'master' into websocket-chat-2 2022-11-11 23:53:42 +09:00
Dean Herbert
151dd7c62f Fix one more reverted change 2022-11-11 22:21:38 +09:00
Dean Herbert
0af4bdaf5c Add back removed configuration elements 2022-11-11 18:29:15 +09:00
Dean Herbert
106f1cf90b Merge branch 'master' into combo-colour-brightness-limit 2022-11-11 18:24:39 +09:00
Dean Herbert
392d4e778e Change default beatmap listing key binding to Ctrl+B 2022-11-11 17:10:46 +09:00
Dan Balasescu
fe58329478
Merge pull request #21151 from peppy/taiko-judgement-fixes
Fix various issues surrounding hit judgements
2022-11-11 16:41:46 +09:00
Dan Balasescu
5bdbf56f43 Merge branch 'master' into taiko-judgement-fixes 2022-11-11 15:48:33 +09:00
Dan Balasescu
1a1a186d22 Merge branch 'master' into taiko-barline-separation 2022-11-11 15:47:06 +09:00
Dan Balasescu
db25e9e9c8 Merge branch 'master' into combo-colour-brightness-limit 2022-11-11 15:31:28 +09:00
Bartłomiej Dach
88195d3984
Merge branch 'master' into improve-ui-control-sound-sync 2022-11-11 07:29:37 +01:00
Dan Balasescu
6ac19615fa Fix test failure 2022-11-11 14:55:41 +09:00
Bartłomiej Dach
63270c8619
Merge branch 'master' into improve-ui-control-sound-sync 2022-11-11 05:50:28 +01:00
Susko3
5b1e39abd5 Fix parsing of Language when using default system locale 2022-11-10 22:56:24 +01:00
maromalo
83a3f1b82e Add computeRawScore() 2022-11-10 14:15:20 -03:00
Dean Herbert
86862b1f29
Merge pull request #21164 from Susko3/fix-default-24h-time-format
Fix `Prefer24HourTime` default value being wrong
2022-11-11 00:16:47 +09:00
Dan Balasescu
94772a9cda
Merge pull request #21147 from peppy/fix-timeline-editor-crash
Fix editor hard crash when beatmap file specified out-of-range timeline zoom value
2022-11-10 22:59:55 +09:00
Dan Balasescu
fd88c92d5a
Merge pull request #21144 from peppy/fix-storyboard-end-start-time
Fix incorrect handling of storyboard events with `end_time` before `start_time`
2022-11-10 22:53:45 +09:00
Dean Herbert
1f8824a754 Update framework 2022-11-10 16:14:40 +09:00
Dean Herbert
bc6da2bbaf Merge branch 'master' into fix-default-24h-time-format 2022-11-10 16:14:37 +09:00
Dean Herbert
4c6ab27ae4
Merge pull request #21192 from Samaoo/fix-tablet-area-dimensions
Fix inaccurate tablet area dimensions when applying aspect ratio
2022-11-10 14:14:11 +09:00
Dan Balasescu
606d42c679
Merge pull request #21184 from peppy/skinnable-things-cleanup
Skinnable class naming pass
2022-11-10 12:52:08 +09:00
Dan Balasescu
46d4fc0279
Merge pull request #21167 from peppy/fix-storyboard-variables
Fix some issues with storyboard variables
2022-11-10 12:46:52 +09:00
Dan Balasescu
dddbc7496a
Merge pull request #21168 from peppy/fix-storyboard-extension-lookup
Fix sprites not displaying in storyboard if filename extension is missing in script
2022-11-10 12:31:00 +09:00
Dan Balasescu
051f7f4c68
Merge pull request #21173 from peppy/toggle-hit-markers
Add the ability to toggle off hit marker displays in the editor
2022-11-10 12:23:53 +09:00
Dean Herbert
3547c04002
Merge branch 'master' into skinnable-things-cleanup 2022-11-10 12:09:32 +09:00
Dan Balasescu
f90010628c
Merge pull request #21185 from peppy/fix-editor-sample-spam
Fix editor playing too many sounds when user performs a manual seek during playback
2022-11-10 12:05:16 +09:00
Dan Balasescu
040d7ee247
Merge pull request #21183 from peppy/skinnable-nullability
Apply nullability considerations to all skin related classes
2022-11-10 11:50:41 +09:00
Joseph Madamba
2b81f3048c
Merge branch 'master' into close-side-overlays-when-main-overlay 2022-11-09 12:48:57 -08:00
Samaoo
be81c658af move tablet area calculations to functions 2022-11-09 20:14:01 +01:00
Piggey
0011f4e7be fix comment lol 2022-11-09 19:59:04 +01:00
Piggey
4fbc240aa1 Merge remote-tracking branch 'origin/gameplay-leaderboard-fix' into gameplay-leaderboard-fix 2022-11-09 19:53:56 +01:00
Piggey
ab53fb17d3 change displayed text from #? to - 2022-11-09 19:53:36 +01:00
Samaoo
533a2db5ea fix inaccurate tablet area dimensions when applying aspect ratio 2022-11-09 18:48:47 +01:00
C0D3 M4513R
a57c824092
Merge branch 'master' into beatmap-info 2022-11-09 14:47:08 +00:00
Dean Herbert
e19ba65f91 Remove LookupName from base ISkinComponentLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94 Rename SkinnableTarget to GlobalSkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
ab458320c4 Fix some lingering inspections 2022-11-09 17:46:24 +09:00
Dean Herbert
4457648b1c Fix editor playing too many sounds when user performs a manual seek during playback 2022-11-09 17:42:33 +09:00
Dean Herbert
d4251271d8 Apply nullability to SkinnableDrawable 2022-11-09 13:59:13 +09:00
Dean Herbert
bf26dbffc2 Apply nullability to skinning support classes 2022-11-09 13:59:13 +09:00
Dawid Sośnia
9549e55ef8
Merge branch 'ppy:master' into gameplay-leaderboard-fix 2022-11-08 20:04:13 +01:00
Piggey
d48c56818f change positionText to display "#?" if tracked score is being 51st on the leaderboard 2022-11-08 20:02:21 +01:00
Dean Herbert
4448fcb3c8 Override combo colour brightness normalisation setting only in editor 2022-11-08 18:29:10 +09:00
Dean Herbert
dd4cd3cf8e Move gameplay configuration to interface to allow editor overriding 2022-11-08 18:25:24 +09:00
Dean Herbert
ada039151b Add the ability to toggle off hit marker displays in the editor 2022-11-08 18:07:06 +09:00
Dean Herbert
9650ae1329 Limit editor background dim to 75% maximum 2022-11-08 17:20:37 +09:00
Dean Herbert
349d262c18 Remove commented unbind 2022-11-08 17:19:48 +09:00
Dean Herbert
b166e477c2
Merge branch 'master' into editor-background 2022-11-08 17:18:34 +09:00
Dean Herbert
b9374cae55 Hide settings/notifications regardless of IsPresent state of new overlay 2022-11-08 14:38:02 +09:00
Dean Herbert
0b34340447 Fix sprites not displaying in storyboard if filename extension is missing in script 2022-11-08 14:34:28 +09:00
Dean Herbert
064a245c50 Don't trim whitespace from variable keys / values 2022-11-08 13:30:11 +09:00
Dean Herbert
b764d1bd04 Decode variables earlier in flow in case they include indent logic
Without this change, the `depth` calculation could be incorrect.
2022-11-08 13:29:42 +09:00
maromalo
64e6276397 Fix score rounding issue 2022-11-08 01:10:21 -03:00
Dean Herbert
49f530910c
Merge pull request #21163 from frenzibyte/always-show-cursor-on-focus-loss
Always display menu cursor when game is not focused
2022-11-08 12:37:19 +09:00
Dean Herbert
2163cd212b Automatically close settings and notification overlays when opening main overlay
Closes #21162.
2022-11-08 12:04:07 +09:00
Salman Ahmed
1465d043f4
Merge branch 'master' into song-select-transition-improvement 2022-11-08 03:36:19 +03:00
Susko3
8568520c33 Fix Prefer24HourTime default value
Will use the system culture so it always matches the rest of the OS.
2022-11-08 01:34:06 +01:00
Salman Ahmed
7ee9018a94 Always display menu cursor when game is not focused 2022-11-08 03:18:12 +03:00
C0D3 M4513R
ab650d8a1b
Use AutoSizeAxes 2022-11-07 15:22:20 +01:00
Dean Herbert
2b72c3833b Remove unnecessary centering logic in DrawableJudgement 2022-11-07 17:19:32 +09:00
C0D3 M4513R
28ab092b6f
Simplify the whole Templating process 2022-11-07 07:55:42 +01:00
Dan Balasescu
fdca3c2d1c Rename method for consistency 2022-11-07 14:35:42 +09:00
Dan Balasescu
67e99b5344 Lookup channels before calling HandleJoinedChannel() 2022-11-07 14:34:55 +09:00
Dean Herbert
c69a4f9333 Move major barline portion to default implementation to allow for further customisation
Of note, this removes the "major" barline triangles from legacy skins. I
think this is more correct, as they did not display in stable.
2022-11-07 14:29:58 +09:00
Dean Herbert
f6d93fcd5a Fix editor hard crash when beatmap file specified out-of-range timeline zoom value 2022-11-07 12:54:02 +09:00
Joseph Madamba
76df61504f
Remove unnecessary timestamp update
Co-authored-by: Dean Herbert <pe@ppy.sh>
2022-11-06 19:45:59 -08:00
Joseph Madamba
61ec0ba566 Make chat line timestamp adjust to 24-hour time setting 2022-11-06 19:28:01 -08:00
Joseph Madamba
b977fc8181 Use autosize instead of max width on fixed width timestamps 2022-11-06 19:28:01 -08:00
Dean Herbert
6085120dc5 Fix incorrect handling of storyboard events with end_time before start_time 2022-11-07 12:25:36 +09:00
Dan Balasescu
f931bdc5ff Fix channel lookup not considering missing ids 2022-11-07 12:25:23 +09:00
Dan Balasescu
cd8402df72 Print event type to logs 2022-11-07 12:11:50 +09:00
Dean Herbert
391840404d Play exiting transition in both directions 2022-11-07 11:59:43 +09:00
Dan Balasescu
cf03001c83 Better handling for joining channels with only ID 2022-11-07 11:52:07 +09:00
Dan Balasescu
e3adf5a985 Handle channel parts 2022-11-07 11:36:55 +09:00
Dan Balasescu
93f84ece0d
Merge pull request #21118 from peppy/increase-main-menu-background-change-delay
Adjust transition effect for main menu backgrounds
2022-11-07 11:33:09 +09:00
maromalo
8eef2ba8de quality shenanigans 2022-11-06 20:12:26 -03:00
maromalo
b7ef9b176d Make score type consistent 2022-11-06 19:59:27 -03:00
C0D3 M4513R
0c17571c58
Merge branch 'master' into beatmap-info 2022-11-06 18:53:14 +00:00
Dean Herbert
e7b543de2f Move disabled check to apply to all calls to updateGlow() 2022-11-07 02:19:13 +09:00
Dean Herbert
700f8b0469
Remove pointless nested if conditional
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-11-07 02:13:04 +09:00
Dean Herbert
14a4fdfbe3
Merge pull request #21135 from CenTdemeern1/master
Fix preposition for exclusive fullscreen prompt
2022-11-07 00:00:19 +09:00
Dean Herbert
75bf023f14 Fix HSPAColour.ToColour not being pure 2022-11-06 23:35:51 +09:00
CenTdemeern1
e8603ede15 Fix second prompt 2022-11-06 15:35:26 +01:00
Dean Herbert
51078bddf9 Remove unused bindable 2022-11-06 23:34:04 +09:00
Dean Herbert
ee68f33e3c
Merge pull request #21109 from frenzibyte/fix-beatmap-duplicating-again
Fix beatmap cards still potentially showing twice in listing
2022-11-06 18:46:31 +09:00
Dean Herbert
e02c477008
Merge pull request #21017 from andy840119/remove-nullable-disable-in-the-checks
Remove nullable disable in the checks.
2022-11-06 18:39:03 +09:00
CenTdemeern1
887a3f3e28 Fix preposition for exclusive fullscreen prompt 2022-11-05 19:44:25 +01:00
Bartłomiej Dach
84179fb087
Merge branch 'master' into combo-colour-brightness-limit 2022-11-05 16:48:56 +01:00
Salman Ahmed
c27f7fa421
Merge branch 'master' into song-select-transition-improvement 2022-11-04 20:16:02 +03:00
Salman Ahmed
ee6f036c44 Add note about using ExceptBy once it's available 2022-11-04 19:35:24 +03:00
Salman Ahmed
ce5aacb760 Filter out duplicated cards using custom equality comparer instead 2022-11-04 19:27:35 +03:00
Salman Ahmed
bd512c4937 Remove equality comparison implementation from BeatmapCard
This turned out to be a hurdle instead as it disallows adding two
beatmap cards of equal beatmap, which, while being a good behaviour in
client, makes tests more complicated to work.
2022-11-04 19:27:20 +03:00
Dan Balasescu
d426977f03 Handle channel joins 2022-11-04 20:11:42 +09:00
Dan Balasescu
f12ada9d92 Fix chat connecting too early 2022-11-04 19:36:24 +09:00
Dean Herbert
78bb940e6c Don't play hover sounds on disabled elements 2022-11-04 19:06:08 +09:00
Dean Herbert
0e350f52f5 Fix SliderBar disabled value potentially not transferring to hover sounds 2022-11-04 19:06:08 +09:00
Dean Herbert
a2fdad4afc Fix slider updating glow when disabled 2022-11-04 19:06:08 +09:00
Dean Herbert
a16540dc6d Update Nub hover animation to better suit immediacy of sound effects 2022-11-04 19:06:08 +09:00
Dan Balasescu
1d2818dc70 Reschedule ack request on completion 2022-11-04 19:02:26 +09:00
Dan Balasescu
66bbe34116 Move polling clients to osu.Game.Tests namespace 2022-11-04 18:52:57 +09:00
Dean Herbert
8b58475ee0 Update OsuButton hover animation to better suit immediacy of sound effects 2022-11-04 18:51:09 +09:00
Dan Balasescu
fa18b5f701 Construct notifications client inside ChannelManager 2022-11-04 18:51:00 +09:00
Dan Balasescu
72745656e7 Remove StartChat()/chat enablement 2022-11-04 18:48:34 +09:00
Dan Balasescu
58396d49dc Fix handling of local echo deduplication 2022-11-04 18:44:22 +09:00
Dean Herbert
4f14ae4e34 Adjust transition effect for main menu backgrounds 2022-11-04 17:45:14 +09:00
Dean Herbert
4bbff99f31 Remove unnecessary fade in SeasonalBackground 2022-11-04 17:45:14 +09:00
Dean Herbert
2b934e0bea Increase delay for changing background on returning to main menu 2022-11-04 17:45:13 +09:00
Dean Herbert
923d44a769 Update dependencies 2022-11-04 17:00:58 +09:00
Dean Herbert
566738494f
Merge pull request #20952 from OliBomby/bezier-convert
Add conversion algorithm for lazer slider curves to work with stable
2022-11-04 16:49:51 +09:00
Dean Herbert
c40c70509e Improve song select transition to gameplay 2022-11-04 15:24:37 +09:00
Joseph Madamba
e11d44d14f Add url clicking support to profile badges 2022-11-03 18:12:32 -07:00
Salman Ahmed
ac8fb4f9b2 Fix beatmap cards still potentially showing twice in listing 2022-11-04 03:23:34 +03:00
C0D3 M4513R
21effc5f54
Merge remote-tracking branch 'origin/beatmap-info' into beatmap-info 2022-11-03 18:55:06 +01:00
C0D3 M4513R
a435e365ea
Allow for the Value of BeatmapInfoDrawable to be formatted 2022-11-03 18:54:55 +01:00
Dean Herbert
f6c376c090 Minor refactoring 2022-11-03 20:29:27 +09:00
Dean Herbert
f75c4ba95f Update resources 2022-11-03 20:27:44 +09:00
Dean Herbert
1edde8f73c Merge branch 'master' into disabled-button-sfx 2022-11-03 20:27:41 +09:00
Dean Herbert
cdb3494418
Merge pull request #20765 from Feodor0090/comment-report
Implement comments reporting
2022-11-03 20:09:00 +09:00
Dean Herbert
486515ed90
Merge pull request #20758 from frenzibyte/maintain-common-mod-selection
Maintain selection of common mods when switching rulesets
2022-11-03 20:08:32 +09:00
Jamie Taylor
59bbd9c460
Fix some components using wrong sample set 2022-11-03 17:47:49 +09:00
Jamie Taylor
f1c17129eb
Add support for 'disabled' sample variation to HoverClickSounds 2022-11-03 17:47:49 +09:00
C0D3 M4513R
2ec29c0f26
Merge branch 'master' into beatmap-info 2022-11-03 07:09:02 +00:00
C0D3 M4513R
502bfa950e
Fix potential resource leak 2022-11-03 08:05:26 +01:00
Dean Herbert
c48c9ecb6d
Merge pull request #20743 from frenzibyte/improve-beatmap-card-buttons
Improve clickable area of beatmap card icon buttons
2022-11-03 15:47:08 +09:00
Dean Herbert
e336d486a6
Merge pull request #21093 from peppy/auto-skip-multiple-times
Fix automated skip not skipping more than once when required
2022-11-03 15:46:56 +09:00
Dean Herbert
56ef519cc2 Move PopoverContainer into OnlineOverlay to ensure correct colours 2022-11-03 15:43:06 +09:00
Dean Herbert
e6c45b8ab5 Merge branch 'master' into comment-report 2022-11-03 15:35:42 +09:00
Dean Herbert
20dd405c2b
Merge branch 'master' into maintain-common-mod-selection 2022-11-03 15:32:40 +09:00
Dean Herbert
07bfac40fa Adjust padding to avoid overlap with card border when expanded 2022-11-03 14:03:28 +09:00
Dean Herbert
66a6084d3f Scale in the background fill alongside the icon 2022-11-03 14:03:19 +09:00
Dan Balasescu
fc191807c6 Fix velocity test failing with no audio device 2022-11-03 13:59:22 +09:00
Dean Herbert
df9f49eef2 Move hover layer behind icon
Looked bad on the "already downloaded" state where the icon becomes
black.
2022-11-03 13:56:07 +09:00
Dean Herbert
fb0bc597a0 Merge branch 'master' into improve-beatmap-card-buttons 2022-11-03 13:53:29 +09:00
Dean Herbert
4154be6cda Adjust auto-skip to skip multiple times if necessary 2022-11-03 13:52:29 +09:00
Dean Herbert
aef3c7918c Add total skip count to SkipOverlay 2022-11-03 13:52:24 +09:00
C0D3 M4513R
49427fe8b7
Merge branch 'master' into beatmap-info 2022-11-02 15:38:15 +00:00
C0D3 M4513R
95e2521ca4
Use more Localisations 2022-11-02 13:56:55 +01:00
C0D3 M4513R
2e5db5e259
Remove nullable disable from TextElement 2022-11-02 13:24:05 +01:00
C0D3 M4513R
ed7e3a29e2
Add Localisation
Also add Labels for what is displayed, and prefix/suffix for Labels
Add a Prefix and Suffix for Values
2022-11-02 13:00:45 +01:00
cdwcgt
7073d8dd8e
range and precision for EditorDim 2022-11-02 19:57:01 +09:00
cdwcgt
a44c7c7514
range and precision for EditorWaveformOpacity 2022-11-02 19:56:35 +09:00
Dean Herbert
3ec9686e58 Fix test failures and rename configuration value to match better 2022-11-02 18:15:18 +09:00
Dean Herbert
0e502de8b4 Rename field to match usage 2022-11-02 18:04:42 +09:00
Dean Herbert
4f8e912f06 Fix APINotification parsing failing 2022-11-02 17:53:19 +09:00
Dean Herbert
c3eb0c6330 Merge branch 'master' into editor-background 2022-11-02 17:43:38 +09:00
Dan Balasescu
063a8bdf9e Remove messages from silenced users 2022-11-02 17:13:14 +09:00
Dan Balasescu
f688ed12d0 Add test for removing chat messages 2022-11-02 17:00:47 +09:00
Dan Balasescu
cb51fc7384
Merge pull request #21071 from peppy/fix-multiple-import-notifications
Fix multiple notifications arriving for imports in edge cases
2022-11-02 16:54:56 +09:00
Dan Balasescu
db34f238c0 Fix inverted condition 2022-11-02 15:47:30 +09:00
Dan Balasescu
e5f53b1ad8 Use Interlocked.Exhange() instead
Increment isn't correct since it returns the post-incremented value. It
also always increments.
2022-11-02 15:18:48 +09:00
cdwcgt
9884618290
rename editorDim to editorBackgroundDim 2022-11-02 15:12:15 +09:00
cdwcgt
d6b8439121
add xmldoc for DimAmount 2022-11-02 15:11:49 +09:00
cdwcgt
df1f7e2b13
remove #nullable disable 2022-11-02 15:09:40 +09:00
Dean Herbert
2b04e852be
Merge branch 'master' into websocket-chat-2 2022-11-02 14:56:13 +09:00
Dan Balasescu
22f662a076
Merge pull request #21070 from peppy/standardise-visual-settings-ui-components
Standardise "Visual Settings" components to fix mismatched paddings and labels
2022-11-02 14:53:00 +09:00
Dean Herbert
e761c0395d Fix multiple notifications arriving for imports in edge cases 2022-11-02 14:47:56 +09:00
Dean Herbert
4dabb1aa9c
Merge pull request #20990 from smoogipoo/socket-client
Generalise `HubClientConnector` into `SocketClientConnector`
2022-11-02 14:17:36 +09:00
Dean Herbert
37300ba9e2 Standardise "Visual Settings" components to fix mismatched paddings and labels 2022-11-02 14:01:57 +09:00
Dean Herbert
50b6fe4acb Localise new label 2022-11-02 14:01:03 +09:00
Dean Herbert
61fc3c8cc0 Add setting to visual settings toolbox 2022-11-02 13:58:34 +09:00
Dean Herbert
5b8699872f Merge branch 'standardise-visual-settings-ui-components' into combo-colour-brightness-limit 2022-11-02 13:58:33 +09:00
Dean Herbert
d8aa06ea92 Standardise "Visual Settings" components to fix mismatched paddings and labels 2022-11-02 13:55:56 +09:00
Dean Herbert
99ba7c29dd Change range to 0-100% and rename to "normalisation" 2022-11-02 13:47:11 +09:00
Dan Balasescu
30800c9252 Add/adjust xmldocs 2022-11-02 13:16:34 +09:00
Dean Herbert
2f3c80f884 Remove toggle and change method of application to blend with original colour 2022-11-02 13:08:29 +09:00
Dean Herbert
a01602e63c Merge branch 'master' into combo-colour-brightness-limit 2022-11-02 12:09:27 +09:00
Dan Balasescu
3816152c9d Merge branch 'socket-client' into websocket-chat-2 2022-11-02 11:49:57 +09:00
Dan Balasescu
e59c8b7d24 Use IDisposable instead 2022-11-02 11:49:04 +09:00
Dan Balasescu
c9108ce41b Rename StartAsync -> ConnectAsync 2022-11-02 11:44:16 +09:00
Dan Balasescu
46d1713e28 Rename Socket* -> PersistentEndpoint* 2022-11-02 11:43:22 +09:00
Dan Balasescu
8ac2075c61 Fix possible threading issues
Not really sure of the best way to handle this in general. It could be
argued that this should be a `Component` type and the bindable bound in
`LoadComplete()`...
2022-11-02 10:04:25 +09:00
C0D3 M4513R
975eed964e
Don't make Beatmap in OsuGameBase public
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
2022-11-01 21:19:01 +01:00
C0D3 M4513R
c231a20cbb
Add a generic text Element
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
2022-11-01 20:54:52 +01:00
C0D3 M4513R
905ebc3c1f
Initial implementation of a Beatmap Information Skinning Element
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
2022-11-01 20:46:32 +01:00
Dean Herbert
9f031b55a1 Merge branch 'master' into fix-directory-selector-breadcrumb 2022-11-01 22:28:13 +09:00
Dean Herbert
e104242864 Update framework 2022-11-01 22:28:06 +09:00
Dan Balasescu
5b25ef5f2f Construct notifications client via IAPIProvider 2022-11-01 21:34:34 +09:00
Bartłomiej Dach
ac554c644d
Merge branch 'master' into fix-slider-sv-snap 2022-11-01 13:19:46 +01:00
Dan Balasescu
5621db8a2e
Merge pull request #21052 from peppy/fix-control-point-info
Fix control points not being cloned when running beatmap conversion
2022-11-01 21:04:49 +09:00
Dean Herbert
f014acfc8d Fix DrawableHitObject.AccentColour not being updated if object entry is not attached 2022-11-01 19:34:53 +09:00