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

78 Commits

Author SHA1 Message Date
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
Dean Herbert
f52cac966b Fix multiple blank lines 2019-02-08 18:45:32 +09:00
Dan Balasescu
7ec0b4ba77 Fix nullref during room creation (#4228) 2019-02-08 17:53:01 +09:00
smoogipoo
5643dc2e99 Remove redundant qualifiers 2019-02-08 15:44:05 +09:00
smoogipoo
43240ea85e Fix playlist issues with room creation 2019-02-08 15:23:03 +09:00
smoogipoo
594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
ProgrammaticNajel
593e0b36f5 Add overflow padding in other multiplayer screen components
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
ProgrammaticNajel
e4084b7d5d Add overflow padding in other multiplayer screen components
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
Dean Herbert
2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +09:00
Dean Herbert
5977fc838f Limit available durations for the time being 2018-12-27 21:59:08 +09:00
smoogipoo
eaba9e1378 Fix mode icon not being updated for correct ruleset 2018-12-27 18:16:30 +09:00
smoogipoo
f70e60747f Remove option for 1-minute duration 2018-12-27 16:54:14 +09:00
smoogipoo
8e031325dd CI fixes 2018-12-27 16:28:17 +09:00
smoogipoo
50201e602e Combine implementations of status + end date info 2018-12-27 16:19:00 +09:00
Dean Herbert
a1fa914c66 Participants 2018-12-26 21:58:14 +09:00
Dean Herbert
bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
#	osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/IRoomManager.cs
#	osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
#	osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00
smoogipoo
152f3b1da3 Add processing overlay to lounge screen 2018-12-26 21:20:53 +09:00
smoogipoo
0c384417f1 Add processing overlay to room creation process 2018-12-26 21:19:02 +09:00
Dean Herbert
26834abd33 Fade and no schedule 2018-12-26 21:18:55 +09:00
smoogipoo
940d4a16bb Add error message when creation fails 2018-12-26 21:18:44 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +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
smoogipoo
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
smoogipoo
91b83cd4b8 Fix leaderboard being queried on room creation 2018-12-25 13:57:25 +09:00
smoogipoo
6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +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
ac0e6f8d42 Fix post-merge issues 2018-12-22 15:35:22 +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
09d7dc73dc Allow channel manager and osugame to be null 2018-12-22 14:38:46 +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
f1a9a352fc Cleanup bindable handling 2018-12-22 14:01:06 +09:00
smoogipoo
4149734f89 Add room leaderboard to results 2018-12-21 18:22:13 +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