1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 16:47:24 +08:00
Commit Graph

43600 Commits

Author SHA1 Message Date
Salman Ahmed
391c4e529c Add test coverage for all added features 2021-08-23 11:12:48 +03:00
Salman Ahmed
9fa39cd34e Revert ruleset when not applied filters (includes scope change) 2021-08-23 11:11:06 +03:00
Salman Ahmed
cb7c2f713b Store default ruleset value for ability to revert 2021-08-23 11:09:26 +03:00
Salman Ahmed
1d89d757af Fix beatmap ruleset selector selecting initial ruleset 2021-08-23 09:57:05 +03:00
Salman Ahmed
2ba88923b6 Select user preferred ruleset on overlay ruleset selectors initially 2021-08-23 08:58:54 +03:00
Dan Balasescu
2ad5914fec
Merge branch 'master' into decouple-ruleset-bindables 2021-08-23 12:40:57 +09:00
Dan Balasescu
f2f3ba7bcd
Merge pull request #14450 from bdach/wedge-bpm-not-updating
Fix BPM display not updating if rate-changing mods were enabled after selecting beatmap
2021-08-23 12:22:59 +09:00
Bartłomiej Dach
9538a32b5e
Explicitly update beatmap info wedge on mod change
This used to already be the case prior to b419ea7, but in a very
roundabout way. Changes to the value of the star difficulty bindable -
including indirect changes via the set of active mods changing - would
trigger the wedge display to regenerate and load asynchronously.

b419ea7 accidentally broke this by moving down the bindable retrieval to
a lower level, at which point `WedgeInfoText` would only receive the set
of mods selected at the time at which a given beatmap was selected, and
not receive any further updates, breaking the BPM display updating in
real time (as `WedgeInfoText` could not be aware that rate-changing mods
were even in effect).

To resolve, explicitly reload the wedge's contents on mod changes.
2021-08-22 19:16:46 +02:00
Bartłomiej Dach
e4a8f72167
Add failing test case 2021-08-22 19:16:43 +02:00
Salman Ahmed
45b8bd175c Decouple rankings overlay's ruleset bindable from game-wide bindable 2021-08-22 16:25:35 +03:00
Salman Ahmed
d164529be8 Fix ruleset selector not updating to the first ruleset item until after LoadComplete()
This fixes the whole issue behind `Ruleset.Value` being null, by
updating `Current` on BDL rather than waiting for the base logic which
executes at `LoadComplete`.

This seems like something that should happen at the base `TabControl` class itself, by switching `Current` right after the first added tab item, rather than doing it on `LoadComplete`, but I'm not sure about changing framework logic outright, so fixing this locally until it occurs on other places.
2021-08-22 16:25:34 +03:00
Salman Ahmed
f390e9a156
Merge pull request #14443 from peppy/update-resources
Update resources
2021-08-22 13:38:27 +03:00
Dean Herbert
81e3c9d40f Update resources 2021-08-22 19:13:21 +09:00
Dean Herbert
82f3e947dd
Merge pull request #14442 from TheShadowEevee/android-ruleset-error-fix
Add null check for Android ruleset loading
2021-08-22 19:07:37 +09:00
Salman Ahmed
956112eb10 Reword comment and remove brackets 2021-08-22 12:40:41 +03:00
Michael Malloy
9cd0a182f6
Add null check for Android ruleset loading 2021-08-22 00:38:48 -05: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