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

9127 Commits

Author SHA1 Message Date
ekrctb
1bac471b49 Adapt to PlatformAction type change 2021-07-21 16:12:53 +09:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter 2021-07-21 00:04:51 +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
Dan Balasescu
15127f972e
Merge branch 'master' into fix-online-play-sub-screens-not-async-loaded 2021-07-20 18:47:41 +09:00
Dean Herbert
d87ea741ed Fix OnlinePlayScreen sub-screens not loaded asynchronously 2021-07-20 16:38:39 +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
844152e1b1
Merge pull request #13861 from peppy/add-password-support
Add multiplayer room password support
2021-07-19 23:32:28 +09:00
Dan Balasescu
6e104fe084
Merge pull request #13894 from peppy/fix-beat-synced-container-alt
Fix multiple issues with `BeatSyncedContainer`
2021-07-19 23:19:20 +09:00
smoogipoo
6a55cb9df0 Revert unintended change
It's a deeper issue with ScreenStack (see:
https://github.com/ppy/osu-framework/issues/4619).
2021-07-19 22:52:07 +09:00
smoogipoo
57a99886d5 Fix password icon not disappearing when no password 2021-07-19 22:31:01 +09:00
smoogipoo
892d858d5f Fix compile error 2021-07-19 22:23:31 +09:00
smoogipoo
b7c2d6b1ab Merge branch 'master' into add-password-support 2021-07-19 22:23:09 +09:00
Dan Balasescu
5ef1fe6948
Merge branch 'master' into fix-replay-date 2021-07-19 21:58:37 +09:00
Dan Balasescu
f3bcaf7f11
Merge pull request #13929 from peppy/i-deep-cloneable
Create a deep clone of score for score submission purposes
2021-07-19 21:58:27 +09:00
smoogipoo
3168a927dc Fix possible exception 2021-07-19 20:50:30 +09:00
smoogipoo
2515785f93 Use room password to fill settings textbox 2021-07-19 20:03:32 +09:00
Dean Herbert
b3f60c8253 Fix date being updated on replays unexpectedly 2021-07-19 19:28:35 +09:00
Dean Herbert
f16b4957aa Move clone to earlier in the process 2021-07-19 19:18:34 +09:00
Dan Balasescu
f1f6af88a1
Merge pull request #13926 from peppy/set-rank-on-failed-submission
Set score's rank on a failed submission
2021-07-19 18:45:21 +09:00
Dean Herbert
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00
Dean Herbert
caba78cb5d Copy score during submission process to ensure it isn't modified 2021-07-19 14:14:28 +09:00
Dean Herbert
3c028ce05c Add IDeepCloneable interface and update existing CreateCopy methods to use it 2021-07-19 12:54:17 +09:00
Dean Herbert
d7f997a7f3 Set score's rank on a failed submission
As we don't have a `RankInfo.F`, this is the next best choice. I am also
adding a check osu-web side for this - this is just to make sure we
aren't sending scores with SS when they are not actually completed.

I'm working on a separate PR to ensure this does not get mutated during
the player exit process.
2021-07-19 12:36:15 +09:00
Dean Herbert
c6bc95767d Simplify popover hide logic and add test coverage 2021-07-17 22:31:47 +09:00
Dean Herbert
c966cb0530 Fix dependency lookup failing due to location of PopoverContainer 2021-07-17 15:04:18 +09:00
Dean Herbert
50eed26bd1 Rename radio button item to label 2021-07-17 02:32:23 +09:00
Dean Herbert
eac9b1ec7e Disable toolbox composition buttons when beatmap is not timed 2021-07-17 02:30:13 +09:00
Dean Herbert
3ae5f6707a Expose whether an EditorBeatmap has timing present or not via bindable 2021-07-17 02:30:00 +09:00
Dean Herbert
7a671754f2 Change RadioButton's object to a string 2021-07-17 02:29:31 +09:00
Dean Herbert
d0fc258886 Remove unused OsuLogo.BeatMatching 2021-07-15 15:11:42 +09:00
Dean Herbert
9d693c75cf Add Schedule to restore password text box focus behaviour 2021-07-14 23:56:52 +09:00
Dean Herbert
cc09a8b5ba Update to use OsuPopover implementation 2021-07-14 23:55:46 +09:00
Dean Herbert
b5dd9403b1 Merge branch 'master' into add-password-support 2021-07-14 23:53:03 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user 2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40 Fix multiplayer screen buttons showing no text when local user not available 2021-07-13 17:59:58 +09:00
Dean Herbert
60e17fc2b7 Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog 2021-07-13 17:12:35 +09:00
Dean Herbert
481e4dedb0 Move PopoverContainer to OsuGameBase 2021-07-13 16:51:31 +09:00
Dean Herbert
6409a518db Focus password text box on popover display 2021-07-13 16:35:37 +09:00
Dean Herbert
5cffaf4d3b Add extra explanatory comment to avoid any confusion 2021-07-13 14:34:56 +09:00
Dean Herbert
125bd36ab1 Send password in request ctor directly 2021-07-13 14:27:07 +09:00
Dean Herbert
c6bd58ea4b Exit match sub screen when a room goes away
Closes #13847.

I think we can probably get some test coverage of this if required, but
needs a bit of thought (basically an error needs to be thrown during the
multiplayer client portion of the join procedure, after `CurrentRoom` is
non-null but before the join completes).

Manual testing on password branch (#13861) is possible since it
currently errors due to missing method on the live/dev servers.

- Create game, which will fail with `MethodNotExists`.
- Note the fields on the settings screen are emptied.
- Fill fields again and press create game (crash).
2021-07-12 19:20:41 +09:00
Dean Herbert
4dea2d9778 Dismiss popovers on returning to lounge 2021-07-12 18:54:17 +09:00
Dean Herbert
bbc3a013c8 Use BasicPopover for now 2021-07-12 18:29:50 +09:00
Dean Herbert
b4ca6b6188 Update popover logic to take advantage of new explicit popup functionality 2021-07-12 18:25:04 +09:00
Dean Herbert
a3e0168a46 Update tests 2021-07-12 18:25:04 +09:00
Dean Herbert
e25b3518dc Make password popover display inside RoomsContainer rooms 2021-07-12 18:25:04 +09:00
Dean Herbert
9f9d7f9125 Add remaining pieces of password flow (for osu-web join request) 2021-07-12 18:22:52 +09:00