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

95 Commits

Author SHA1 Message Date
Joehu
36041fc245 Fix back button not working correctly with multi song select's mod select 2020-07-14 00:29:57 -07:00
Joehu
3573460d9c Fix multiplayer screens blocking home and alt f4 2020-07-14 00:02:01 -07:00
smoogipoo
b7f5a89f82 Reduce background fade opacity 2020-06-25 22:13:39 +09:00
smoogipoo
3c07defa1a Push to main multiplayer screen instead 2020-06-03 15:57:01 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
smoogipoo
22862256c1 Increase time between polls 2020-02-27 19:42:19 +09:00
smoogipoo
99442ec9c3 Implement single-room multiplayer room polling 2020-02-27 19:23:50 +09:00
Dean Herbert
4a3f281855 Make buttons purple 2020-02-20 18:56:14 +09:00
Dean Herbert
76c57a695b Change create room button colouring to match design 2020-02-20 18:56:00 +09:00
Dean Herbert
a11862ba0d Improve transition between multiplayer screens (and share constants) 2020-02-20 18:03:53 +09:00
Dan Balasescu
51f03d0f07
Adjust comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-20 14:28:38 +09:00
smoogipoo
3338241632 Add back filter control background, adjust opacity 2020-02-19 19:48:34 +09:00
smoogipoo
e966689044 Add beatmap background to multiplayer 2020-02-19 19:42:25 +09:00
Dean Herbert
81cadb7875 Simplify the way multiple subscreens handle their disable states via a custom stack 2020-02-06 14:22:01 +09:00
Dean Herbert
19f516e710 Ensure OsuScreen level leases are taken out synchronously 2020-01-31 19:10:44 +09:00
Dean Herbert
5b405abc52 Schedule forcefullyExit call for safety
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6 Ensure forceful exit completely exits from mutliplayer
Previously it may have gotten blocked by being in a sub screen.
2019-10-31 13:42:28 +09:00
smoogipoo
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
David Zhao
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
smoogipoo
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
smoogipoo
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
414d555484 Fix possible exit from non-current screen 2019-04-22 19:24:57 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
acbcca4462
Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
David Zhao
63b9fa58ef Cleanup 2019-03-11 19:52:28 +09:00
David Zhao
6a1e600099 Create new OsuScreenStack for use in Multiplayer 2019-03-11 19:48:07 +09:00
David Zhao
aeae6143c1 Remove unnecessary variable 2019-03-11 17:47:03 +09:00
David Zhao
0b64af5e02 Put multiplayer background inside a parallax container 2019-03-11 16:51:43 +09:00
David Zhao
2df57c3a29 Give Multiplayer its own background stack 2019-03-11 11:08:04 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
134840f118 Fix nullref 2019-02-16 11:18:17 +09:00
Dean Herbert
d5cce850a8 Revert some unnecessary complications in logo logic 2019-02-12 13:29:41 +09:00
Dean Herbert
272584eb79 Improve file layouts 2019-02-12 13:02:33 +09:00
Dean Herbert
78b47f9fe3 Fix starting matches not working 2019-02-12 11:19:42 +09:00
Dean Herbert
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
Dean Herbert
a30d3739cf Merge remote-tracking branch 'upstream/master' into cmc-rooms 2019-02-08 18:45:39 +09:00
Dan Balasescu
959b1ac845 Fix potential nullref when exiting multiplayer (#4227)
Fixes https://github.com/ppy/osu/issues/3954
2019-02-08 17:28:00 +09:00
smoogipoo
6fe1f57236 Fix crash when start button is repeatedly pressed 2019-02-08 15:39:11 +09:00
smoogipoo
99a7ccc01a Slight cleanup in multiplayer 2019-02-08 15:38:05 +09:00
smoogipoo
42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
smoogipoo
7f13e3c5f7 Directly resolve the filter bindable 2019-02-08 13:02:17 +09:00