ekrctb
7b6981c632
Don't show the flip button when flipping is a no-op
2021-07-22 13:29:32 +09:00
Dean Herbert
73866c2837
Merge branch 'master' into catch-editor-flip
2021-07-21 19:54:39 +09:00
Dan Balasescu
4c63e8e036
Merge pull request #13964 from peppy/fix-mod-overflow
...
Fix mod display overflowing on contracted results panels
2021-07-21 18:52:00 +09:00
Dean Herbert
006971485b
Merge pull request #13934 from ekrctb/catcher-area-catcher
...
Move `Catcher` from `CatcherArea` to `CatchPlayfield`
2021-07-21 18:43:20 +09:00
Dean Herbert
adda96ac86
Merge pull request #13962 from ekrctb/platform-action
...
Adapt to framework `PlatformAction` type change
2021-07-21 18:17:38 +09:00
Dean Herbert
a261f1ef8f
Merge pull request #13960 from ekrctb/selection-box-can-flip
...
Allow specifying different value of scaling and flipping support for a selection box
2021-07-21 18:05:18 +09:00
Dean Herbert
6effa24157
Merge branch 'master' into catcher-area-catcher
2021-07-21 18:00:35 +09:00
Dean Herbert
0a950a5da7
Disable auto property get-only inspection
2021-07-21 17:59:50 +09:00
Dan Balasescu
b390018e64
Merge branch 'master' into fix-mod-overflow
2021-07-21 17:26:47 +09:00
Dan Balasescu
b556d6d382
Merge pull request #13963 from peppy/tidy-mod-display
...
Tidy up `ModDisplay`
2021-07-21 17:26:39 +09:00
Dean Herbert
173334383f
Update framework
2021-07-21 16:56:09 +09:00
Dean Herbert
b910c21230
Add ModFlowDisplay
and consume in ContractedPanelMiddleContent
2021-07-21 16:53:04 +09:00
ekrctb
179ba3c9a8
Merge branch 'master' into catcher-area-catcher
...
# Conflicts:
# osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
2021-07-21 16:45:28 +09:00
Dean Herbert
b65e607941
Add test covering mod displays with too many mods
2021-07-21 16:43:41 +09:00
Dean Herbert
5bee06fd5f
Remove forgotten AutoSize
specification
2021-07-21 16:43:29 +09:00
ekrctb
d9f9ad35be
Move catcher base size constant to Catcher
.
2021-07-21 16:43:24 +09:00
Dean Herbert
396ad79d50
Remove unnecessary UnbindAll
call
2021-07-21 16:43:08 +09:00
ekrctb
30777795ce
Add some doc comment to CatcherArea
2021-07-21 16:40:35 +09:00
Dean Herbert
a63065dbe9
Tidy up ModDisplay
2021-07-21 16:38:25 +09:00
ekrctb
94678064ff
Rename CatcherArea.MovableCatcher
to Catcher
2021-07-21 16:28:31 +09:00
ekrctb
da3499f10e
Simplify the way of getting catcher
2021-07-21 16:27:44 +09:00
ekrctb
1bac471b49
Adapt to PlatformAction
type change
2021-07-21 16:12:53 +09:00
ekrctb
d2d3214d47
Implement horizontal flipping of hit objects in catch editor
2021-07-21 16:07:02 +09:00
ekrctb
4c8b9c168e
Use added position range computation in hit object move handling
2021-07-21 16:06:34 +09:00
ekrctb
60f876511d
Add function of computing position range occupied by hit objects
2021-07-21 16:06:34 +09:00
Dean Herbert
f81814832e
Merge pull request #13957 from frenzibyte/allow-custom-game-names
...
Allow running with different game IDs for debug builds of osu!lazer
2021-07-21 16:06:32 +09:00
ekrctb
1bff4373b3
Allow specifying flipping support of selection box different from scaling
2021-07-21 15:59:45 +09:00
Dan Balasescu
3121836741
Merge pull request #13942 from peppy/fix-autoplay-results-timestamp
...
Avoid showing time of play on results screen when autoplay
2021-07-21 15:37:31 +09:00
Dan Balasescu
747c475b95
Merge pull request #13932 from peppy/fix-multiple-request-completion-states
...
Fix API request potentially firing failed events after completion
2021-07-21 15:11:03 +09:00
Dean Herbert
3dddcf3582
Remove unused using statement
2021-07-21 15:11:01 +09:00
Dean Herbert
3a968977cb
Add rider configuration for dual-client testing
2021-07-21 15:09:50 +09:00
Dean Herbert
4148d3fdac
Add a bit more safety to argument parsing logic
2021-07-21 15:02:15 +09:00
Salman Ahmed
ebd555129f
Change to int
-only debug client ID
2021-07-21 07:53:24 +03:00
Salman Ahmed
37393a8432
Allow defining custom storage name for debug builds of osu!lazer
2021-07-21 03:12:44 +03:00
Dean Herbert
59dd3452fe
Merge pull request #13954 from bdach/user-profile-beatmap-api-adjustments
...
Adjust user beatmap section naming on profile overlay to match web
2021-07-21 08:21:10 +09:00
Dean Herbert
ba62a0f877
Merge pull request #13955 from bdach/password-popover-enter
...
Allow confirming room password by pressing Enter
2021-07-21 08:20:20 +09:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter
2021-07-21 00:04:51 +02:00
Bartłomiej Dach
1e634d9db0
Adjust user beatmap sections on profile overlay to match web
2021-07-20 21:55:17 +02:00
Dan Balasescu
738d321788
Merge pull request #13946 from peppy/fix-online-play-sub-screens-not-async-loaded
...
Fix `OnlinePlayScreen` sub-screens not loaded asynchronously
2021-07-20 19:51:13 +09:00
Dean Herbert
d066ebcd70
Merge pull request #12682 from frenzibyte/refactor-combo-colour-retrieval
...
Refactor combo colours retrieval to use skin config lookups instead
2021-07-20 19:47:57 +09:00
Dean Herbert
8e1f8c28bd
Use default
value to denote no play date, rather than null
2021-07-20 19:05:08 +09:00
Dean Herbert
1a8ab77f21
Revert nullability change
2021-07-20 19:03:29 +09:00
Dan Balasescu
15127f972e
Merge branch 'master' into fix-online-play-sub-screens-not-async-loaded
2021-07-20 18:47:41 +09:00
Dan Balasescu
13733d8c75
Merge pull request #13943 from peppy/fix-subscreen-exit-before-loaded
...
Ensure online play subscreen is loaded before forwarding `OnExiting`
2021-07-20 18:36:42 +09:00
Dean Herbert
26cc4af87c
Revert unintended changes
2021-07-20 16:44:51 +09:00
Dean Herbert
d87ea741ed
Fix OnlinePlayScreen
sub-screens not loaded asynchronously
2021-07-20 16:38:39 +09:00
Dean Herbert
4113eae6ad
Add test coverage of fail scenario
2021-07-20 16:37:13 +09:00
Salman Ahmed
1af230c48c
Merge branch 'master' into refactor-combo-colour-retrieval
2021-07-20 10:08:25 +03:00
Dean Herbert
fe414b942f
Ensure online play subscreen is loaded before forwarding OnExiting
...
Closes https://github.com/ppy/osu-framework/issues/4619 (actually not a
framework issue; the framework correctly guards against this scenario,
see
4e29504384/osu.Framework/Screens/ScreenStack.cs (L277)
).
Added the assertions to be very explicit about the nested stack's state
at this point. Both of those events can only be triggered if the stack
has a loaded screen (as far as I can tell), making this check
unnecessary in those cases.
2021-07-20 15:51:34 +09:00
Dean Herbert
662822a40c
Avoid showing time of play on results screen when autoplay
...
Closes https://github.com/ppy/osu/issues/13940 .
2021-07-20 15:19:44 +09:00