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

554 Commits

Author SHA1 Message Date
recapitalverb
7c9569c9a3
Merge branch 'master' into remove-duplicated-load 2020-02-15 12:10:34 +07:00
Dean Herbert
a4215106ff Merge branch 'master' into match-detail-area 2020-02-15 11:46:29 +09:00
smoogipoo
3b2e4ecb2d Merge branch 'match-playlist' into match-subscreen-redesign 2020-02-14 23:40:04 +09:00
smoogipoo
61d539dc67 Fix first playlist item not getting selected 2020-02-14 23:39:39 +09:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
smoogipoo
9eaf372587 Immediately update selected state 2020-02-14 21:17:07 +09:00
smoogipoo
b92f1ad68d Implement match subscreen re-design 2020-02-14 20:48:09 +09:00
smoogipoo
2ea8c47c83 Fix incorrect footer button size 2020-02-14 20:44:41 +09:00
smoogipoo
b762e5e8a5 Implement overlined components 2020-02-14 20:42:14 +09:00
smoogipoo
929eb4f035 Add match footer 2020-02-14 20:35:52 +09:00
smoogipoo
d0b7b7f53a Re-layout match settings overlay 2020-02-14 20:34:15 +09:00
smoogipoo
d5496321e2 Implement leaderboard chat display 2020-02-14 20:31:55 +09:00
smoogipoo
c75a774297 Extract participants list from the room inspector 2020-02-14 20:27:37 +09:00
smoogipoo
80fd9485a9 Refactor ready button to support selected playlist item 2020-02-14 20:18:53 +09:00
smoogipoo
c0dba63278 Remove match info 2020-02-14 20:14:25 +09:00
smoogipoo
b0793b06ed Re-implement the match header 2020-02-14 20:10:36 +09:00
smoogipoo
5ec9f454d5 Implement the match beatmap detail area 2020-02-14 17:20:38 +09:00
smoogipoo
aceba8791c Clean up selection handling 2020-02-14 16:56:44 +09:00
smoogipoo
afd3e4604b Fix race condition causing selection to be reset incorrectly 2020-02-14 16:48:23 +09:00
smoogipoo
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
smoogipoo
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +09:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item 2020-02-13 21:41:23 +09:00
Dean Herbert
28ca1a5bcc
Merge branch 'master' into participants-bindable 2020-02-13 19:31:50 +09:00
smoogipoo
bce9c8f3f3 Make room participants into a bindable list 2020-02-13 18:59:15 +09:00
smoogipoo
75bef15583 Remove "current" multiplayer room item 2020-02-13 18:48:28 +09:00
smoogipoo
91edadfe9d Make playlist beatmap and ruleset into bindables 2020-02-13 18:12:47 +09:00
Dean Herbert
fd71a53717 Fix test regression 2020-02-06 14:28:09 +09:00
Dean Herbert
a84386ba01 Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering 2020-02-06 14:22:52 +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
114fd967c1 Revert "Remove leasing at a Multiplayer screen level"
This reverts commit 304a071e39.
2020-02-06 13:47:34 +09:00
Dean Herbert
e548a4b8dd Fix missing bind causing regression in filter 2020-02-06 13:36:49 +09:00
Dean Herbert
061b8c389f Fix null search string causing an exception 2020-02-06 13:03:04 +09:00
Dean Herbert
1dc7fc4a33 Fix case where playlist is empty 2020-02-06 13:01:48 +09:00
Dean Herbert
a79d6ff27a Change transition to better handle mass filter cases 2020-02-06 12:17:20 +09:00
Dean Herbert
304a071e39 Remove leasing at a Multiplayer screen level 2020-02-06 12:17:20 +09:00
Dean Herbert
50c4e34c92 Add ruleset to multiplayer filter criteria 2020-02-06 12:17:20 +09:00
Dean Herbert
00edc7e66f Fix RoomsContainer test scene not displaying 2020-02-06 12:14:17 +09:00
recapitalverb
9898a926b2 Use ScoreInfo.DisplayAccuracy everywhere 2020-02-03 22:11:36 +07:00
Dean Herbert
19f516e710 Ensure OsuScreen level leases are taken out synchronously 2020-01-31 19:10:44 +09:00
smoogipoo
76af8bea5d Fix percentage-formatted displays containing a space 2020-01-29 19:51:24 +09:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Dean Herbert
2325f0382c Cancel a potentially pending filter update when an update occurs 2019-11-21 13:46:45 +09:00
smoogipoo
0cbe29dbec Refactor / cleanup debouncing 2019-11-21 11:05:18 +09:00
smoogipoo
10287eb66d Add debounce logic in several places 2019-11-15 17:58:47 +09:00
smoogipoo
1b4bcb81c8 Fix filtering breaking on secondary filters 2019-11-15 17:49:02 +09:00
smoogipoo
f0b7b2e1c4 Fix broken test case 2019-11-15 11:07:16 +09:00
smoogipoo
956fb9912d Hook up multiplayer search filter 2019-11-15 08:23:56 +09:00
Huo Yaoyuan
f3f5094c26 Convert delegate to local function. 2019-11-12 20:14:22 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
5127b52c25 Merge remote-tracking branch 'upstream/master' into game-handles-links 2019-11-03 13:04:18 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +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
smoogipoo
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
Joehu
5f700f2ae9 Simplify exit logic of screens with textboxes using back button receptor 2019-10-01 08:26:34 -07:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
smoogipoo
e356cc8d9e Refactor MatchBeatmapPanel for thread safety 2019-08-13 17:57:16 +09:00
smoogipoo
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
smoogipoo
92c2dafa12 Tighten accessibility 2019-08-13 17:34:16 +09:00
smoogipoo
6b57c9801d Cull some unnecessary whitespace 2019-08-13 17:32:43 +09:00
Andrei Zavatski
982066dfdf Convert to method group 2019-08-12 10:38:34 +03:00
Andrei Zavatski
cb910a6518 Replace if/else statement 2019-08-12 10:02:45 +03:00
Andrei Zavatski
5b68a2f34a Rename trackManager to previewTrackManager 2019-08-12 09:50:49 +03:00
Andrei Zavatski
520924b440 Don't create a new request if onlineId is null 2019-08-12 09:45:21 +03:00
Andrei Zavatski
9ab132520c Testcase improvements 2019-08-08 12:25:46 +03:00
Andrei Zavatski
e9b5c91690 Fade out existing panel on beatmap change 2019-08-08 12:08:51 +03:00
Andrei Zavatski
08a92c38d7 adjust naming 2019-08-08 12:04:44 +03:00
Andrei Zavatski
1b559c1585 Use async loading 2019-08-08 12:01:33 +03:00
Dean Herbert
a3dbaef4ca Adjust background gradient 2019-08-08 17:29:50 +09:00
Andrei Zavatski
8668bce25d Fix preview can be played on start 2019-08-08 09:52:42 +03:00
Andrei Zavatski
cbcdc28900 Fix hard crash when clicking on a preview button 2019-08-08 09:04:24 +03:00
Andrei Zavatski
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00
Andrei Zavatski
ffed642929 Implement MatchBeatmapPanel 2019-08-08 07:08:51 +03:00
Joehu
0082695cd8 Choose default category sorting instead of being always first 2019-08-02 13:22:58 -07:00
David Zhao
26fc782de9 Don't exit if screenstack is null 2019-07-29 10:35:51 +09:00
Dean Herbert
e76b3e2b40 User property instead of method 2019-07-21 10:42:40 +09:00
iiSaLMaN
842417cf42 Check if selected scope requires API 2019-07-21 03:07:27 +03:00
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
Dean Herbert
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
smoogipoo
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
Andrei Zavatski
9dedd62d9a Revert a hotfix in multi screen
since it's been fixed in a framework
2019-06-24 22:57:18 +03:00
Andrei Zavatski
35516e7304 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 22:52:24 +03:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Andrei Zavatski
bbdb114f04 Add missing blank line 2019-06-24 02:09:00 +03:00
Andrei Zavatski
94e819578e Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
2019-06-24 01:55:35 +03:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03: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
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
smoogipoo
cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +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