Henry Lin
3795030ebb
Merge branch 'master' into mod-incompatibility-ui
2021-08-22 11:14:24 +08:00
Henry Lin
0bbddd297c
Remove unused code
2021-08-22 11:05:53 +08:00
Henry Lin
e213562b2a
Add a red tint on mods incompatible with the current selection
2021-08-22 11:01:17 +08:00
Henry Lin
ef6faf04be
Use FirstOrDefault in TooltipContent
2021-08-22 10:22:18 +08:00
Henry Lin
3d402d9e78
List incompatible mods in tooltip of mod button
2021-08-22 10:13:34 +08:00
Bartłomiej Dach
37c0550921
Merge pull request #14418 from LittleEndu/editor-regex
...
Change editor timestamp regex to not match non-editor ones
2021-08-21 20:20:36 +02:00
Bartłomiej Dach
7ab12959a0
Merge branch 'master' into editor-regex
2021-08-21 19:57:26 +02:00
Dean Herbert
c2c0ff3327
Merge pull request #14425 from frenzibyte/fix-screen-offsetting-on-scaling
...
Fix screen offsetting not handling scaled game content properly
2021-08-22 02:51:17 +09:00
Dean Herbert
77f3668751
Merge branch 'master' into fix-screen-offsetting-on-scaling
2021-08-22 02:28:06 +09:00
Salman Ahmed
9a6ff29951
Reword comment
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-08-21 15:39:57 +03:00
Salman Ahmed
b2ee777ceb
Merge pull request #14431 from peppy/fix-setting-section-clickability
...
Fix bottom area of a settings section not being clickable
2021-08-21 15:31:50 +03:00
Salman Ahmed
1729d43cec
Add explanatory comment
2021-08-21 15:18:03 +03:00
Salman Ahmed
df5354eba6
Merge branch 'master' into fix-setting-section-clickability
2021-08-21 14:25:28 +03:00
Salman Ahmed
a7e513faed
Merge pull request #14430 from peppy/gameplay-chat-mouse-cursor
...
Use the UI mouse cursor when hovering gameplay chat in an interactive state
2021-08-21 14:25:09 +03:00
Salman Ahmed
216ff07497
Merge branch 'master' into fix-setting-section-clickability
2021-08-21 14:11:55 +03:00
Salman Ahmed
76e1d88028
Merge branch 'master' into gameplay-chat-mouse-cursor
2021-08-21 14:01:30 +03:00
Salman Ahmed
21cc24c1d0
Merge pull request #14429 from peppy/improve-chat-username-effect
...
Improve highlighted chat username shadow effect
2021-08-21 13:57:32 +03:00
Dean Herbert
ae47c5cdb3
Fix bottom area of a settings section not being clickable
2021-08-21 15:08:42 +09:00
Dean Herbert
15d443f6b7
Use the UI mouse cursor when hovering gameplay chat in an interactive state
2021-08-21 14:44:54 +09:00
Dean Herbert
36352d1de4
Improve highlighted chat username shadow effect
2021-08-21 14:34:35 +09:00
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
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
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
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
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
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
