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

36387 Commits

Author SHA1 Message Date
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