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

3348 Commits

Author SHA1 Message Date
smoogipoo
5af29f8384 Reduce code duplication 2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb Add error message when creation fails 2018-12-26 21:18:44 +09:00
smoogipoo
9901b11600 Display room join errors as notifications 2018-12-26 21:18:11 +09:00
Dean Herbert
8386e206c3 Update ParticipantInfo 2018-12-26 20:35:54 +09:00
Dean Herbert
5bd3ab51dd Open -> Push 2018-12-26 20:35:54 +09:00
Dean Herbert
6f0d13e36b Move PartRoom calls 2018-12-26 20:35:54 +09:00
smoogipoo
9d305ba024 Reduce code duplication 2018-12-26 20:33:19 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +09:00
smoogipoo
052ab4763a Display room join errors as notifications 2018-12-26 20:32:36 +09:00
Dean Herbert
7a431ed87f Update ParticipantInfo 2018-12-26 20:31:04 +09:00
Dean Herbert
869081ce9c Open -> Push 2018-12-26 20:21:30 +09:00
Dean Herbert
692f5c289d Move PartRoom calls 2018-12-26 20:12:51 +09:00
Dean Herbert
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
Dean Herbert
532a970c0f Give leaderboard and chat more breathing room 2018-12-26 19:20:54 +09:00
Dean Herbert
0cefd4b21d Improve room padding 2018-12-26 19:14:15 +09:00
Dean Herbert
f442e59620 Icon and beatmap title visual pass 2018-12-26 18:01:53 +09:00
Dean Herbert
c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20 RoomSettingsOverlay -> MatchSettingOverlay 2018-12-26 16:50:50 +09:00
Dean Herbert
6e8c46f00b Fix padding and use grid container for more correctness 2018-12-26 15:23:57 +09:00
Dean Herbert
755c6b9243 Make room settings scroll 2018-12-26 15:03:35 +09:00
Dean Herbert
e9556afe22 Don't use all uppercase (is applied automatically) 2018-12-26 14:26:35 +09:00
Dean Herbert
e4a72c0c64 Fix failing testcase 2018-12-26 13:18:36 +09:00
smoogipoo
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
smoogipoo
2f32c4d4d1 Fix title of match song select 2018-12-25 17:17:51 +09:00
smoogipoo
d4f5a8507c Exit from match screen on escape 2018-12-25 17:14:56 +09:00
smoogipoo
91b83cd4b8 Fix leaderboard being queried on room creation 2018-12-25 13:57:25 +09:00
smoogipoo
23d21a45e5 More automated tests 2018-12-25 11:59:08 +09:00
smoogipoo
626ec85ae8 Remove IHasFilterableChildren from class 2018-12-25 11:58:28 +09:00
smoogipoo
6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +09:00
smoogipoo
f79aa07d02 Fix enddate not being bound to 2018-12-25 11:31:36 +09:00
smoogipoo
e0e75c7339 Fix incorrect room status 2018-12-25 11:24:46 +09:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
smoogipoo
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
Dan Balasescu
e6c197e9aa
Merge branch 'master' into improve-text-search 2018-12-22 16:38:50 +09:00
Dean Herbert
005c6ff40c Add tooltip text to results screen pages 2018-12-22 16:30:06 +09:00
smoogipoo
bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dean Herbert
a35d9178f0 Quick rename 2018-12-22 16:20:29 +09:00
Dean Herbert
e7508cbd5e Fix CI issues 2018-12-22 15:55:10 +09:00
Dean Herbert
e404a0bc20 Clean-ups and renames 2018-12-22 15:51:00 +09:00
smoogipoo
baed0ef3ba Rename variable 2018-12-22 15:46:04 +09:00
smoogipoo
b9ec179713 Split out more requests + responses 2018-12-22 15:45:16 +09:00
smoogipoo
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
smoogipoo
ac0e6f8d42 Fix post-merge issues 2018-12-22 15:35:22 +09:00
smoogipoo
bdb6e03dfb Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
# Conflicts:
#	osu.Game/Online/Leaderboards/Leaderboard.cs
#	osu.Game/Online/Leaderboards/LeaderboardScore.cs
#	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
#	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
Dean Herbert
787e65c3c5 Reduce generic-ness 2018-12-22 15:20:35 +09:00
smoogipoo
3570c35d7f Make RoomScore derive ScoreInfo 2018-12-22 15:17:35 +09:00
smoogipoo
6afd2f7263 Adjust styling of disabled settings 2018-12-22 15:00:35 +09:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
smoogipoo
b82bb0ea28 Mate RoomSettingsOverlay fill height 2018-12-22 14:40:10 +09:00
smoogipoo
09d7dc73dc Allow channel manager and osugame to be null 2018-12-22 14:38:46 +09:00
smoogipoo
dbd391825a Rework+fix TestCaseMultiHeader 2018-12-22 14:30:08 +09:00
smoogipoo
7191233be8 Allow roommanager to be null 2018-12-22 14:14:14 +09:00
smoogipoo
21cfe5a3e6 Decouple header from matchscreen 2018-12-22 14:12:27 +09:00
smoogipoo
c06cf5d379 Decouple match info from match screen 2018-12-22 14:08:00 +09:00
smoogipoo
d93421b796 Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
smoogipoo
f1a9a352fc Cleanup bindable handling 2018-12-22 14:01:06 +09:00
smoogipoo
1cb69c3478 Split requests/responses into separate files 2018-12-22 12:50:37 +09:00
smoogipoo
dd0c04ea36 Move RoomManager to multiplayer screen 2018-12-22 12:45:36 +09:00
smoogipoo
7e9cc4e876 Seed the results screen 2018-12-21 18:37:33 +09:00
smoogipoo
4149734f89 Add room leaderboard to results 2018-12-21 18:22:13 +09:00
smoogipoo
8a2cc64bfa Split results screen to allow for extensibility 2018-12-21 16:34:03 +09:00
smoogipoo
fe6c369e07 Fix incorrect channel 2018-12-21 14:37:05 +09:00
smoogipoo
fa2bc16140 Remove participants, add match chat 2018-12-21 14:01:11 +09:00
smoogipoo
14879acd83 Fix possible nullref 2018-12-21 13:26:50 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
smoogipoo
822225577b Add joining/parting room requests 2018-12-20 20:58:34 +09:00
smoogipoo
9031896484 Fix create room button showing in song select 2018-12-20 20:09:17 +09:00
smoogipoo
6a76e335c7 Linkify everything 2018-12-20 20:03:45 +09:00
smoogipoo
deaf4ab4a1 Cleanup 2018-12-20 18:21:55 +09:00
smoogipoo
8db3ac0a9f Make user links clickable 2018-12-20 18:04:39 +09:00
smoogipoo
1701af61d6 Add host avatar+username to match screen 2018-12-20 18:04:22 +09:00
smoogipoo
2e28f378de Move beatmap + mod info to header 2018-12-20 15:17:33 +09:00
smoogipoo
72016a416b Deselect match if ended 2018-12-20 15:17:08 +09:00
smoogipoo
03546c9d0d Implement primary filter routes 2018-12-20 15:16:46 +09:00
smoogipoo
36f6b4fc3f Hook up participated filter
Very early stages, implementation will change.
2018-12-19 18:02:05 +09:00
smoogipoo
673082445e Rework filtering 2018-12-19 16:56:51 +09:00
smoogipoo
c544a5b9f0 Add end date to the drawable room too 2018-12-19 15:20:23 +09:00
smoogipoo
a8d88dea3b Display time remaining in the room 2018-12-19 13:07:56 +09:00
smoogipoo
2c000a9a1d Disallow starting gameplay if there's not enough time in the room 2018-12-19 10:52:15 +09:00
smoogipoo
1051584f0f Fix room duration not being set 2018-12-19 10:51:54 +09:00
smoogipoo
72d1ba897f Reorder tabs 2018-12-18 18:29:13 +09:00
smoogipoo
4050cb88ea Fix potential nullref 2018-12-18 18:09:54 +09:00
smoogipoo
3cdeeb7ac5 Add forceful set helper methods in OsuGame 2018-12-18 18:09:46 +09:00
smoogipoo
e4e1bde5da Fix playlist events running too early
Screens are async loaded
2018-12-18 17:08:07 +09:00
smoogipoo
aabe6c68f5 Fix looping not working 2018-12-18 17:07:47 +09:00
smoogipoo
2f15d10029 Play track while in the multiplayer lobby 2018-12-18 14:45:35 +09:00
smoogipoo
5a8b255bd8 Directly bypass beatmap/ruleset restrictions 2018-12-18 14:17:20 +09:00
smoogipoo
8d640cdc25 Fix leaderboard not being refreshed when finishing gameplay 2018-12-18 12:56:16 +09:00
smoogipoo
cc68cf2f95 Implement duration 2018-12-17 14:44:54 +09:00
smoogipoo
279891ae08 Change "apply" button to say "create" instead 2018-12-17 13:55:42 +09:00
smoogipoo
84552b5cee Refresh leaderboard when returning to lobby 2018-12-17 11:51:28 +09:00
smoogipoo
bf8aae8d9b Boot player back to lobby if token request fails 2018-12-17 11:51:17 +09:00
smoogipoo
2fd2425cc4 Fix playlist deserialisation for creating rooms 2018-12-17 11:05:03 +09:00
Dean Herbert
eec5afa382 Change inspection and add redundant parenthesis to appease codefactor 2018-12-15 16:37:37 +09:00
Dean Herbert
3892454ecc Improve the way text search works at song select 2018-12-15 16:34:48 +09:00
smoogipoo
983a45c4d8 Fix invalid value 2018-12-14 21:21:02 +09:00
smoogipoo
9726eea0d0 Basic score submission implementation 2018-12-14 21:09:17 +09:00
smoogipoo
e8007ac37f Implement multiplayer room leaderboard 2018-12-14 21:08:55 +09:00