1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 21:27:54 +08:00
Commit Graph

32993 Commits

Author SHA1 Message Date
Salman Ahmed
82b784ce5a Change IApplicableToSample to receive adjustable component instead
Done for consistency with `IApplicableToTrack`.
2022-05-10 18:06:03 +03:00
Salman Ahmed
4f5001704e Change IApplicableToTrack to receive adjustable component instead 2022-05-10 18:06:03 +03:00
Salman Ahmed
bbbecbb6b7 Apply time-ramping adjustment using clock instead of track 2022-05-10 18:06:03 +03:00
Dean Herbert
587cc8cdb3
Merge pull request #18204 from frenzibyte/move-soft-handle-exception 2022-05-10 21:57:15 +09:00
Dean Herbert
33f024212f Fix realm refetch operations potentially being unsafe
As seen in test failure https://github.com/ppy/osu/runs/6357384721?check_suite_focus=true.
2022-05-10 21:04:30 +09:00
Dan Balasescu
42fe708225
Fix inspection 2022-05-10 19:56:21 +09:00
Dean Herbert
b2a57c34bb Move implementation to base 2022-05-10 19:10:34 +09:00
Dean Herbert
4d22f26266 Rename property and improve xmldoc 2022-05-10 19:07:07 +09:00
Dean Herbert
cac6d5569c Fix incorrect variable reference in log output 2022-05-10 19:07:00 +09:00
Dean Herbert
a578f7a406 Force nested screens to load synchronously 2022-05-10 18:21:35 +09:00
Dean Herbert
a93c63b2b5 Add loading spinner when loading first run screens 2022-05-10 18:21:35 +09:00
Dean Herbert
25c6226ca9 Adjust transition length for a more seamless screen change 2022-05-10 18:21:35 +09:00
Dean Herbert
493798ae5e Fix nested ui scale example screens no longer fitting 2022-05-10 18:21:35 +09:00
Dean Herbert
63b9e01d38 Fix behaviour screen using old style buttons 2022-05-10 18:21:35 +09:00
Dean Herbert
61313b69ec Standardise font sizes in first run overlay screens 2022-05-10 18:21:35 +09:00
Dean Herbert
e5204e565d Move horizontal padding to content level to better align scrollbar 2022-05-10 18:21:35 +09:00
Dean Herbert
bcce9c5e67 Limit the width of first run overlay content 2022-05-10 18:21:35 +09:00
Dean Herbert
9aadc274bf Show first run dialog on first run of the game 2022-05-10 18:21:35 +09:00
Dan Balasescu
a6674d8c1a
Merge pull request #18205 from peppy/sentry-setup
Bring sentry usage up-to-date
2022-05-10 17:11:36 +09:00
Dean Herbert
6a49eb6875 Add breadcrumb level mappings 2022-05-10 16:14:04 +09:00
Dean Herbert
216c68e6d0 Add unobserved exception hinting 2022-05-10 16:09:16 +09:00
Dean Herbert
363643a16d Remove sentry logger debounce
This is probably going to result in a high quantity of exceptions, but I
think this is fine. We can add rules as we go to not log certain
exception types.
2022-05-10 16:09:16 +09:00
Dean Herbert
c6112b3ae7 Add unhandled exception marking 2022-05-10 16:09:16 +09:00
Dean Herbert
99e6d56508 Add finalizer to sentry logger for safety 2022-05-10 16:09:16 +09:00
Dean Herbert
9734d778f4 Update sentry SDK usage in line with more recent specifications 2022-05-10 16:09:16 +09:00
Dean Herbert
3338bffce3 Attach user to sentry later in startup flow 2022-05-10 16:09:16 +09:00
Dean Herbert
a5b454edc7 Remove unnecessary DI caching of SentryLogger 2022-05-10 16:09:16 +09:00
Dean Herbert
64cc6ebddb Add local user tracking to sentry reporting 2022-05-10 16:09:16 +09:00
Dean Herbert
09c21cde8c Add log level translation 2022-05-10 16:09:16 +09:00
Dean Herbert
dc3c73f723 Enable sentry session tracking 2022-05-10 16:09:16 +09:00
Salman Ahmed
725f5f4dcb Allow one more exception per second in OsuGame and TournamentGame 2022-05-10 10:02:45 +03:00
Salman Ahmed
bcd91ac743 Move exception soft-handling logic to OsuGameBase 2022-05-10 10:02:32 +03:00
Dan Balasescu
8ccf2ee075 Add inline comment 2022-05-10 15:07:08 +09:00
Dan Balasescu
2b7eeadac0 Workaround bad performance when selecting all freemods 2022-05-10 14:48:41 +09:00
Dan Balasescu
886a4815fa
Merge pull request #18180 from frenzibyte/fix-toolbox-double-tap
Fix `SettingsToolboxGroup` not clearing transforms before updating autosize
2022-05-10 13:48:02 +09:00
Dan Balasescu
8a559ff58a
Merge pull request #18191 from frenzibyte/button-use-overlay-colour
Fix buttons no longer coloured using `OverlayColourProvider`
2022-05-10 12:14:10 +09:00
Jai Sharma
2481201a73 Fix selector dismissal behaviour during user actions 2022-05-09 22:58:46 +01:00
Salman Ahmed
96ea4ee7b3 Add explanatory comment 2022-05-09 23:49:05 +03:00
Salman Ahmed
15a04d4225
Merge branch 'master' into fix-dropdown-hover-colour 2022-05-09 21:28:56 +03:00
Salman Ahmed
1fcfeac05f Fix RoundedButton not using its default background colour 2022-05-09 21:07:43 +03:00
Salman Ahmed
ace25af949 Revert "Move default background colour specification to OsuButton"
This reverts commit 172524ff8a.
2022-05-09 20:55:26 +03:00
Bartłomiej Dach
626fcd5d35
Merge branch 'master' into column-flow-cq 2022-05-09 19:22:29 +02:00
Salman Ahmed
172524ff8a Move default background colour specification to OsuButton 2022-05-09 18:21:00 +03:00
Jai Sharma
d4cc2bd7dd Ensure channel selector is dismissed when the current channel is changed 2022-05-09 12:11:25 +01:00
Dean Herbert
70a90722e8 Fix dropdown item hover colour not being set in time
Turns out to be an osu!-side issue. The colour transform was being
shortcutted for the non-displayed case, which meant it was not in a good
state in time for the first hover.

Closes https://github.com/ppy/osu/issues/18163#issuecomment-1120747301
2022-05-09 19:49:45 +09:00
Salman Ahmed
702c6ae658 Fix SettingsToolboxGroup not clearing transforms before updating autosize 2022-05-09 13:49:31 +03:00
Dean Herbert
1c63c27fdf Merge branch 'master' into new-chat-drawable-channel 2022-05-09 18:23:00 +09:00
Dan Balasescu
a16f2349aa Fix next queued item not selecting after gameplay 2022-05-09 17:55:42 +09:00
Dean Herbert
ab1d46b71c
Merge pull request #17270 from frenzibyte/multiplayer-disable-adaptive-speed
Disable mod "Adaptive Speed" in multiplayer
2022-05-09 17:31:47 +09:00
Dean Herbert
3007d2b9df
Merge pull request #18168 from peppy/update-framework
Update framework
2022-05-09 17:31:37 +09:00
Dan Balasescu
e9cc3ab54a
Merge pull request #18164 from Joehuu/fix-exit-dialog-bad-state
Fix popup dialog potentially not clicking last button when dismissed
2022-05-09 17:22:03 +09:00
Salman Ahmed
1677f1d696
Merge branch 'master' into results-screen-scaling 2022-05-09 11:11:55 +03:00
Dean Herbert
72552ecc85 Update framework 2022-05-09 16:49:20 +09:00
Salman Ahmed
2f3ac61b47 Revert "Replace vertical scrolling in results screen with size-preserving container"
This reverts commit 298c2a1828.
2022-05-09 10:35:14 +03:00
Salman Ahmed
422531d8ec Revert "Remove no longer required constant"
This reverts commit 6f4cdccf6c.
2022-05-09 10:35:13 +03:00
Salman Ahmed
3407a299ef Revert "Revert scale locking changes for now"
This reverts commit e4521b1fff.
2022-05-09 10:35:12 +03:00
Salman Ahmed
e4521b1fff Revert scale locking changes for now 2022-05-09 10:16:57 +03:00
Dean Herbert
bf9384b7fe
Merge pull request #18124 from ThePooN/sentry-new-dsn
🔧 Update Sentry DSN
2022-05-09 15:40:35 +09:00
Dean Herbert
6aff531014
Merge pull request #18157 from bdach/mod-overlay/empty-columns
Hide empty columns on new mod select design
2022-05-09 14:59:18 +09:00
Dan Balasescu
3b4fdf20f9 Prevent throwing exceptions on first run without internet 2022-05-09 12:15:54 +09:00
Dan Balasescu
0d0d999199
Merge pull request #18147 from ekrctb/fix-catch-per-hit-object-slider-velocity
Fix per-hit object slider velocity ignored in osu!catch
2022-05-09 11:17:25 +09:00
Jai Sharma
623e2c94ae Adjust padding 2022-05-09 00:32:22 +01:00
Jai Sharma
aeb2984989 Move ChatOverlayDrawableChannel to it's own file 2022-05-09 00:31:22 +01:00
Jai Sharma
5f80e344c3 Update day separator date text to right align against username 2022-05-09 00:15:08 +01:00
Joseph Madamba
21e1f4546a Fix popup dialog potentially not clicking last button when dismissed 2022-05-08 14:40:30 -07:00
Joseph Madamba
172d14bcc6 Improve code quality of mod column flow container 2022-05-08 11:40:14 -07:00
Bartłomiej Dach
d964b4f23c
Fix uneven spacing when some mod columns are hidden 2022-05-08 15:40:21 +02:00
Bartłomiej Dach
6bdcf893b7
Move alpha management closer to screen level
Felt bad messing with alpha at the column level.
2022-05-08 15:40:10 +02:00
Salman Ahmed
6f4cdccf6c Remove no longer required constant 2022-05-08 16:20:26 +03:00
Salman Ahmed
7f1ad149d5 Remove no longer necessary horizontal scroll blocker 2022-05-08 16:04:24 +03:00
Salman Ahmed
298c2a1828 Replace vertical scrolling in results screen with size-preserving container 2022-05-08 16:03:57 +03:00
Bartłomiej Dach
92ccec20d7
Hide mod columns if all mods within are filtered out 2022-05-08 14:53:59 +02:00
ekrctb
dcf0d5a9d5 Fix slider velocity wrongly decoded as scrolling speed in osu!catch 2022-05-08 21:49:42 +09:00
Dean Herbert
b8cb2c1b82 Increase scroll amount slightly 2022-05-08 19:57:03 +09:00
Dean Herbert
778497b9e2 Scroll mod select slightly into view on first display 2022-05-08 18:58:54 +09:00
Bartłomiej Dach
b92d95a17a
Fix mod panels playing samples when hidden at a higher level 2022-05-08 10:39:49 +02:00
Bartłomiej Dach
81ca534f87
Implement ISamplePlaybackDisabler in mod select 2022-05-08 10:39:49 +02:00
Bartłomiej Dach
cbd1169495
Move cache declarations of ISamplePlaybackDisabler to interface 2022-05-08 10:38:58 +02:00
Bartłomiej Dach
9ae019eb39
Move ISamplePlaybackDisabler to more general namespace 2022-05-08 10:38:58 +02:00
ekrctb
3eeedd8024 Fix per-hit object slider velocity ignored in osu!catch 2022-05-08 13:45:21 +09:00
Dean Herbert
230c4e27b8 Simplify and centralise hiding logic for mod overlay
Behaviourally, this also always toggles via button triggering to add the
button flash animation.
2022-05-08 13:03:28 +09:00
Dean Herbert
dabe295196
Merge pull request #18141 from bdach/mod-overlay/multiple-instance-loop
Fix toggling mods after exiting first run setup overlay at UI scale step causing stack overflow
2022-05-08 12:36:06 +09:00
Jai Sharma
8da7bbd322 Code quality 2022-05-07 23:30:46 +01:00
Jai Sharma
c0643cae75 Create ChatOverlayDaySeparator and use in ChatOverlayDrawableChannel 2022-05-07 23:24:34 +01:00
Jai Sharma
f4acfbd0df Change return type of CreateDaySeparator to Drawable 2022-05-07 22:23:46 +01:00
Jai Sharma
bec28c5b28 Remove virtual ColourInfo properties from DaySeparator 2022-05-07 22:16:11 +01:00
Bartłomiej Dach
a45ca2ad10
Fix focused overlays not registering as such
Also fixes bug wherein opening skin editor at song select with mod
select open would show mod select on top of the skin editor.
2022-05-07 22:50:14 +02:00
Bartłomiej Dach
46d3220c07
Isolate sample screens from global mods bindable
Fixes scenario wherein entering the first run setup overlay, exiting at
the "UI scale" step (which shows a song select), then moving to actua
song select and trying to select a mod would lead to a crash.

The crash was caused by two active mod screen instances attempting to
swap the global mod bindable's mod instances for ones they owned. This
logic - while generally problematic and hard to maintain - was fixing
several issues with mod reference management and setting copying, so I'm
letting it live another day.

This change will mean that the song select preview on the "UI scale"
step will not receive the same mods that the actual game has enabled.
That said, it already doesn't use the same beatmap or ruleset, so this
looks fine to break.
2022-05-07 21:44:58 +02:00
Dean Herbert
2278da563e Add various xmldoc for nested classes 2022-05-08 02:03:28 +09:00
Dean Herbert
03c80d9197 Reorder methods / properties in ModSelectScreen for legibility 2022-05-08 01:58:37 +09:00
Dean Herbert
1d27ef18dc Add xmldoc for IsValidMod 2022-05-08 01:49:29 +09:00
Dean Herbert
0d32bf91eb Hardcode hide key handling in ModSelectScreen 2022-05-08 01:35:11 +09:00
Bartłomiej Dach
0c2b4a6c0b
Fix invalid IsLoaded check
Would fail when `availableMods` would be changed from a different thread
while the columns aren't loaded.
2022-05-07 15:44:22 +02:00
Bartłomiej Dach
528342411e
Merge branch 'master' into mod-overlay/integration 2022-05-07 13:52:19 +02:00
Bartłomiej Dach
fe69bd7ed9
Merge branch 'master' into change-mod-scroll-behaviour 2022-05-07 13:29:02 +02:00
Bartłomiej Dach
9a56f6db44
Merge branch 'mod-overlay/back-button' into mod-overlay/integration 2022-05-07 13:15:13 +02:00
Bartłomiej Dach
a716f62a6a
Flash back button when keyboard back binding is pressed 2022-05-07 13:01:36 +02:00
Salman Ahmed
d4c9de8596 Move button width in mod select to constant 2022-05-07 13:23:48 +03:00
Salman Ahmed
9a7aeec098
Merge branch 'master' into mod-overlay/back-button 2022-05-07 13:05:25 +03:00
Salman Ahmed
8ee3fdd0aa Change mod scrolling behaviour to not scroll horizontally on columns/settings 2022-05-07 12:15:11 +03:00
Salman Ahmed
a44e21d1b2
Merge branch 'master' into mod-overlay/localisation-strings 2022-05-07 12:13:28 +03:00
Bartłomiej Dach
fd75963ca2
Dismiss mod select if select binding is pressed 2022-05-07 11:01:05 +02:00
Bartłomiej Dach
e7e7486a8e
Merge branch 'mod-overlay/back-button' into mod-overlay/integration 2022-05-07 10:59:30 +02:00
Bartłomiej Dach
b72cf4cd5d
Merge branch 'mod-overlay/localisation-strings' into mod-overlay/back-button 2022-05-07 10:58:09 +02:00
Bartłomiej Dach
f761d4d4d4
Reuse "select/deselect all" localisable string on column toggle 2022-05-07 10:56:03 +02:00
Bartłomiej Dach
fa0a256f48
Add localisable string for difficulty multiplier display 2022-05-07 10:48:15 +02:00
Salman Ahmed
db04bcf1ce
Merge branch 'master' into distance-snap-grid-current-tiume 2022-05-07 11:47:38 +03:00
Bartłomiej Dach
271d64fd54
Add back button to mod select overlays 2022-05-07 10:17:32 +02:00
Bartłomiej Dach
6ad990dfc3
Add basic localisation strings for new mod select 2022-05-07 10:17:24 +02:00
Bartłomiej Dach
4ff96f82be
Dim other buttons if customisation panel is open 2022-05-07 09:50:09 +02:00
Bartłomiej Dach
18e4c3ed0f
Update mod columns even if they're not present/offscreen
Important to make "select/deselect all" operations work on all columns
simultaneously, even if they're offscreen. Unfortunately by the nature
of how the existing selection animation works, it is hard-tied to the
update loop, so we need to compensate.
2022-05-07 09:50:09 +02:00
Bartłomiej Dach
9514a5cef7
Only load panels asynchronously outside of BDL 2022-05-07 09:50:09 +02:00
Bartłomiej Dach
9f96dd47d1
Remove schedule in panel load
It was causing selection/deselection of all mods to work improperly if a
select/deselect all operation was requested before the panel was
scrolled into view.

In general the schedule was an over-optimisation - the game-global set
of available mods shouldn't be changing so often as to warrant such an
aggressive debounce.
2022-05-07 09:50:09 +02:00
Bartłomiej Dach
852e4a9766
Add select/deselect all buttons to free mod select screen 2022-05-07 09:29:33 +02:00
Bartłomiej Dach
0b95594f60
Add some more padding between footer and column scroll 2022-05-07 09:29:33 +02:00
Bartłomiej Dach
0c6de331f3
Move footer button padding to a higher level 2022-05-07 09:29:32 +02:00
Bartłomiej Dach
202a603d72
Merge branch 'master' into distance-snap-grid-current-tiume 2022-05-07 08:49:30 +02:00
Dean Herbert
dd63657dfb
Merge pull request #18065 from huoyaoyuan/code-style
Enforce code style analysis shipped with .NET SDK
2022-05-07 14:58:19 +09:00
Dean Herbert
2dd9899cd7
Merge pull request #18126 from bdach/mod-overlay/fix-broken-mod-reference-logic
Fix several issues with new mod select reference replacement logic
2022-05-07 14:36:05 +09:00
Dean Herbert
ce14fddcb2 Use above-1 offset instead for more correct feeling parallax 2022-05-07 14:02:07 +09:00
Dean Herbert
71758390b5 Fix time based distance grid alpha not correctly accounting for distance spacing multiplier 2022-05-07 13:37:36 +09:00
Jai Sharma
6fc808be22 Code quality 2022-05-06 23:17:59 +01:00
Jai Sharma
9d62206176 Update new chat overlay day separator colours and spacing
Updates the `DaySeparator` component to have separately settable colours
for the text and the lines.

Updates existing overrides of the `DaySeparator` to use the new colour
setter.

Create new `ChatOverlayDrawableChannel` with adjusted spacing and new
`DaySeparator` colours.
2022-05-06 23:06:18 +01:00
Bartłomiej Dach
8c73ed7207
Fix sequence equality check not using reference comparison 2022-05-06 21:47:04 +02:00
Bartłomiej Dach
621f746789
Do not modify selected mods through panel state change during external update 2022-05-06 21:47:04 +02:00
Bartłomiej Dach
c199b8fcb6
Simplify state management in ModColumn
Bad sign when you can't follow your own code.

All of the various state changing methods were flattened into one
because it was too hard to follow what was calling what and why.
2022-05-06 21:46:16 +02:00
Salman Ahmed
8080f784fd Apply offset by a factor of 0.8x from screen offset 2022-05-06 22:20:09 +03:00
Salman Ahmed
049fed42e2 Fix side overlay offsetting not affecting fullscreen overlays 2022-05-06 21:42:20 +03:00
Hugo Denizart
cc251ed5c3
🔧 Update Sentry DSN 2022-05-06 19:52:25 +02:00
Salman Ahmed
723fce8174 Move inverting value to happen outside clamp
Looks to have no effect, but makes sense to happen outside instead.
2022-05-06 18:54:13 +03:00
Salman Ahmed
d78f1d158d Use GetEndTime() instead of StartTime
Companion to
246479bf34
2022-05-06 18:51:35 +03:00
Salman Ahmed
112496204d Make nested class private 2022-05-06 18:50:28 +03:00
Salman Ahmed
3077d398ef
Merge branch 'master' into distance-snap-grid-current-tiume 2022-05-06 18:20:22 +03:00
Salman Ahmed
1409f8ca96
Merge branch 'master' into fix-toolbox-expansion 2022-05-06 18:00:01 +03:00
Dean Herbert
bda57dd970
Merge pull request #18122 from bdach/mod-overlay/leftover-mod-area-border
Remove leftover border thickness spec in mod settings area
2022-05-06 23:58:35 +09:00
Salman Ahmed
f222affe88
Merge branch 'master' into fix-toolbox-expansion 2022-05-06 17:54:14 +03:00
Salman Ahmed
144d33f0d2
Merge branch 'master' into distance-snapping-test 2022-05-06 17:29:27 +03:00
Bartłomiej Dach
c533c93ffd
Remove leftover border thickness spec in mod settings area
Was never supposed to be there, it was a vestige of a previous design
iteration that went by unnoticed.
2022-05-06 15:34:49 +02:00
Bartłomiej Dach
56fa5c9db1
Merge branch 'master' into editor-drag-box 2022-05-06 15:22:39 +02:00
Bartłomiej Dach
29a3ab7e7a
Halve drag box padding
Allows the drag box borders to collapse in on themselves to a single
line if the drag selection has zero width or height.
2022-05-06 15:21:35 +02:00
Bartłomiej Dach
e527574ede
Merge branch 'master' into fix-toolbox-expansion 2022-05-06 13:47:36 +02:00
Dean Herbert
98eab9668d
Merge pull request #18119 from bdach/mod-overlay/broken-hover
Fix mod panels not hovering correctly after closing customisation area via mouse on new mod select
2022-05-06 20:42:33 +09:00
Dean Herbert
fad1f727bb Fix editor drag box visuals 2022-05-06 20:34:44 +09:00
Bartłomiej Dach
e9d52aa954
Remove not-accessed field 2022-05-06 13:09:37 +02:00
Bartłomiej Dach
a915b7333c
Remove unused using directive 2022-05-06 13:08:54 +02:00
Bartłomiej Dach
839f9373b2
Merge branch 'master' into exit-multiplayer-is-dangerous 2022-05-06 12:57:13 +02:00
Dean Herbert
88c190f3e3 Change colour denoting expanded state to be gray rather than yellow
I always found the yellow colour very non-descript in this case. Gray
seems to work better?
2022-05-06 19:45:17 +09:00
Dean Herbert
b432885e5f Tidy up ordering of SettingsToolboxGroup 2022-05-06 19:39:09 +09:00
Dean Herbert
59add66632 Remove unnecessary autosize workaround (was fixed long ago) 2022-05-06 19:39:00 +09:00
Dean Herbert
949e30c4b4 Remove auto-expansion of individual toolbox groups when parent expanding container expands 2022-05-06 19:36:41 +09:00