1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 03:57:25 +08:00
Commit Graph

51310 Commits

Author SHA1 Message Date
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
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
Salman Ahmed
077c77d524 Add method for scaling results screen in tests 2022-05-08 16:00:07 +03:00
Bartłomiej Dach
569b73cf69
Merge pull request #18152 from peppy/scroll-mod-select-into-view
Scroll mod select slightly into view on first display
2022-05-08 13:58:16 +02: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
Dean Herbert
aef5093e47
Merge pull request #18151 from bdach/mod-overlay/samples-playing-while-hidden
Fix mod panel samples playing when using autoplay shortcut
2022-05-08 18:45:52 +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
Bartłomiej Dach
4199bab1f1
Merge pull request #18145 from peppy/simplify-hide-logic
Simplify and centralise hiding logic for mod overlay
2022-05-08 10:26:57 +02: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
Salman Ahmed
834e7b4323
Merge pull request #18142 from bdach/mod-overlay/skin-editor-breakage
Fix skin editor overlay showing behind mod select overlay
2022-05-08 00:30:31 +03: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
bdea6d8654
Add failing test for mod overlay not closing on entering skin editor 2022-05-07 22:47:19 +02:00
Bartłomiej Dach
a3e61fddcb
Rename skin editor scene library test scene to be more general 2022-05-07 22:43:53 +02:00
Bartłomiej Dach
836de49135
Adjust skin editor scene library test for extensibility 2022-05-07 22:43:47 +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
3bb22dece6
Merge pull request #18111 from bdach/mod-overlay/integration
Replace old mod overlay with new design
2022-05-08 02:44:50 +09: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
c907dbe56f
Merge pull request #18133 from frenzibyte/change-mod-scroll-behaviour
Change mod scrolling behaviour to not scroll horizontally on columns/settings
2022-05-07 13:51:13 +02:00
Bartłomiej Dach
fe69bd7ed9
Merge branch 'master' into change-mod-scroll-behaviour 2022-05-07 13:29:02 +02:00
Salman Ahmed
6326216a6a
Merge pull request #18132 from bdach/mod-overlay/back-button
Add local back button to new mod select design
2022-05-07 14:27:18 +03:00
Bartłomiej Dach
5d6d7bb324
Fix incorrect assert in multiplayer song select test scene 2022-05-07 13:15:16 +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
1fe6749baa
Merge pull request #18131 from bdach/mod-overlay/localisation-strings
Add basic localisation strings for new mod select
2022-05-07 13:04:58 +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
e8518a3a1a
Merge pull request #18117 from peppy/distance-snap-grid-current-tiume
Highlight distance snap grid rings that are close to the current time value
2022-05-07 11:13:13 +02: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
Salman Ahmed
e9b0ae6da5
Merge branch 'master' into mod-overlay/localisation-strings 2022-05-07 11:33:18 +03:00