1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 17:13:07 +08:00
Commit Graph

44539 Commits

Author SHA1 Message Date
Salman Ahmed
318f830cd2 Expand test coverage for different scaling modes
Intentionally not using `[Values]` as the scale modes can be applied to
the running game instance directly, rather than recreating it all over
again.

The same could be said for the notification overlay but not sure, seems
like something that should be considered at an `OsuGameTestScene` level
instead (whether the same game instance can be reused for further
testing).
2021-08-21 04:19:55 +03:00
Salman Ahmed
20f193c1c2 Fix screen offsetting not handling scaled game instances
By using `Content` instead, now the logic will get the X of the settings
overlay at the `Content` space, which can be scaled in the
`ScalingMode.Everything` mode.

And in the case of `ScalingMode.ExcludeOverlays`, a subcontainer
somewhere inside `Content` that's holding the screen stack would be scaled,
but `Content` won't be affected which is what we want in that case.
2021-08-21 04:16:12 +03:00
Endrik Tombak
058d2d2a49 Use nekodex's regex from osu-web 2021-08-20 23:01:06 +03:00
Endrik Tombak
8745fe9e34 Change editor timestamp regex to not match non-editor ones 2021-08-20 22:32:04 +03:00
Dean Herbert
d3dba296d6 Update resources 2021-08-20 23:47:35 +09:00
Dan Balasescu
9de0729bfc
Merge pull request #14377 from peppy/temporary-directory-test-storage
Update test scenes in line with temporary directory changes framework-side
2021-08-20 23:27:39 +09:00
Dean Herbert
e13b516f31 Fix excess blank lines 2021-08-20 22:26:38 +09:00
Dan Balasescu
0c936aec4b
Merge branch 'master' into temporary-directory-test-storage 2021-08-20 22:09:42 +09:00
Dean Herbert
5e234fb746 Add try catch to avoid test failures on windows 2021-08-20 22:07:13 +09:00
smoogipoo
f85d3665d8 Cleanups 2021-08-20 21:45:24 +09:00
smoogipoo
5192ee3b57 Fix initial display in room background 2021-08-20 21:40:35 +09:00
smoogipoo
5c8ca32ea4 Simplify lounge implementation 2021-08-20 21:33:21 +09:00
smoogipoo
b1a732b9b7 Remove selectedRoom from OnlinePlayScreen 2021-08-20 21:28:48 +09:00
smoogipoo
ceb07826d7 Merge branch 'master' into remove-current-room 2021-08-20 21:10:41 +09:00
smoogipoo
9458cd5a31 Make DrawableMatchRoom background load instantly 2021-08-20 21:07:51 +09:00
smoogipoo
b190020c4b Block lounge background screen from exiting 2021-08-20 21:02:25 +09:00
Dan Balasescu
30d7817aad
Merge pull request #14384 from peppy/settings-dim-other-sections
Dim all but the current settings section
2021-08-20 20:52:07 +09:00
Dan Balasescu
0aea39f5f1
Merge branch 'master' into temporary-directory-test-storage 2021-08-20 20:41:54 +09:00
Dan Balasescu
0a6b678059
Merge branch 'master' into settings-dim-other-sections 2021-08-20 20:22:22 +09:00
Dan Balasescu
c9ac828129
Merge pull request #14405 from LittleEndu/test-section-top-visible
Expand `TestSceneSectionsContainer` to test for the scrolled to section being visible
2021-08-20 20:22:15 +09:00
Dan Balasescu
06112fcd79
Merge pull request #14406 from peppy/fix-intro-screen-beatmap-retrieval
Allow intro screen to retrieve beatmap even if rulesets is not loaded
2021-08-20 20:19:36 +09:00
Dean Herbert
b9ff94485d Revert usage of OsuGameTestScene for TestSceneOsuGame
Turns out we likely don't want this, as it means the testing user (using
a visual test browser) will not have access to their beatmaps. Can
revisit at a future date if the temporary files are still an issue.
2021-08-20 19:45:54 +09:00
Dean Herbert
77149044a5 Allow intro screen to retrieve beatmap even if rulesets is not loaded 2021-08-20 19:43:48 +09:00
Dean Herbert
51edb0f073
Merge pull request #14404 from smoogipoo/room-block-click
Fix online room being deselected when joined
2021-08-20 18:38:35 +09:00
Endrik Tombak
cbee379f62 Test scrolled to section top is visible 2021-08-20 12:30:49 +03:00
smoogipoo
d304e283e4 Don't deselect online room when joined 2021-08-20 18:14:59 +09:00
smoogipoo
c22c6f3a49 Initial room background implementation 2021-08-20 18:14:12 +09:00
Dean Herbert
591ba8cb09 Ensure the final scroll target is used when checking for whether too far down 2021-08-20 17:56:35 +09:00
smoogipoo
258ba4674c Fix background overflows 2021-08-20 17:50:49 +09:00
Dean Herbert
03e6ca5ba9 Adjust scroll behaviour to feel better 2021-08-20 17:40:56 +09:00
Dean Herbert
2d19f37dc6 Add missing new method in UserTrackingScrollContainer for scrolling into view 2021-08-20 17:40:41 +09:00
Dean Herbert
139ff2d6e2 Only fade header in when hovering a section
Feels less like the controls are interactive when hovering this way.
2021-08-20 17:40:05 +09:00
smoogipoo
3d96da84e6 Set a default background 2021-08-20 17:05:46 +09:00
smoogipoo
8524937c82 Move screenstack up a level 2021-08-20 17:02:55 +09:00
Dean Herbert
c7266c74a0 Always prefer clicked section when present 2021-08-20 17:00:20 +09:00
Dean Herbert
cff7b1e98f Ensure the correct fade level is applied over all state changes 2021-08-20 17:00:08 +09:00
Lucas A
9b4c806855 Apply review suggestions. 2021-08-20 09:47:23 +02:00
Lucas A
0a1c9a6c05 Move DownloadButtonStrings -> CommonStrings 2021-08-20 09:26:38 +02:00
smoogipoo
610a162271 Merge branch 'master' into remove-current-room 2021-08-20 16:23:36 +09:00
Lucas A
19cc4a14a3 Localise top score mods statistics 2021-08-20 09:22:15 +02:00
Dan Balasescu
3f37d4395f
Merge pull request #14389 from peppy/fix-messagepack-union
Fix android not being able to connect to multiplayer server
2021-08-20 16:19:56 +09:00
Dan Balasescu
54bc532f0d
Merge branch 'master' into fix-messagepack-union 2021-08-20 16:01:04 +09:00
Dean Herbert
659ec0c1b8
Merge pull request #14403 from Joehuu/fix-nub-glow
Fix nub glow color not having 0 alpha when being set
2021-08-20 15:07:30 +09:00
Dan Balasescu
781a4f997f
Merge pull request #14392 from peppy/fix-login-as-guest
Ensure all request failures are correctly handled during login
2021-08-20 14:27:05 +09:00
Dan Balasescu
dcff30ed6e
Merge branch 'master' into fix-login-as-guest 2021-08-20 14:06:28 +09:00
Dan Balasescu
52b9616909
Merge pull request #14350 from LittleEndu/cursor-trail-middle
Avoid drawing segments of cursor trail near current cursor position
2021-08-20 13:49:13 +09:00
Dan Balasescu
6128a38054
Merge branch 'master' into cursor-trail-middle 2021-08-20 13:28:51 +09:00
Dean Herbert
98357d51da
Merge pull request #14323 from minetoblend/editor-seek
Prevent seeking before mp3 start time while editor is playing
2021-08-20 13:28:20 +09:00
Dan Balasescu
845c374a4a
Merge pull request #14402 from frenzibyte/update-inspections
Update code inspection settings to hide "merge into pattern" again
2021-08-20 12:53:34 +09:00
Joseph Madamba
284c871e39
Fix glow color potentially being set incorrectly when glowing
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-08-19 20:33:19 -07:00