Commit Graph

124 Commits

Author SHA1 Message Date
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
3015d40f8f Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
5643dc2e99 Remove redundant qualifiers 2019-02-08 15:44:05 +09:00
43240ea85e Fix playlist issues with room creation 2019-02-08 15:23:03 +09:00
42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
17fdfc15d9 Fix room title in the breadcrumbs 2019-02-07 20:09:49 +09:00
1c2450a95a Fix up room inspector status 2019-02-07 17:59:14 +09:00
1e0135af6f Move StatusColouredContainer into a more public location 2019-02-07 17:52:40 +09:00
2d61548251 Fix room name being coloured 2019-02-07 16:45:36 +09:00
a9aa22c97b Remove ShadowModel requirement 2019-02-06 13:52:48 +09:00
594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
37c1f5a824 Split polling logic from RoomManager, now a container 2019-02-05 15:38:19 +09:00
b5d187c4af Fix post-merge errors 2019-01-29 21:27:32 +09:00
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
e1e7759e0f Re-implement MultiplayerSubScreen 2019-01-25 19:32:37 +09:00
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
da135346b2 Fix screen titles 2019-01-25 18:38:48 +09:00
15100632f1 Remove MultiplayerSubScreen and fix multiplayer crashes 2019-01-25 18:26:04 +09:00
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +09:00
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
4cae9bae83 Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
7ac20c3545 Add overflow padding to account for parallax shifting
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
5269ca31be Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
59f7c5a26e Fix room inspector cover not resetting when no room selected 2019-01-17 18:44:22 +09:00
ba9cdf2ce2 Add null check to fix crash on deselecting multiplayer room 2019-01-17 18:17:47 +09:00
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
eaba9e1378 Fix mode icon not being updated for correct ruleset 2018-12-27 18:16:30 +09:00
ea1309e768 Fix missing bind 2018-12-27 17:15:43 +09:00
50201e602e Combine implementations of status + end date info 2018-12-27 16:19:00 +09:00
a1fa914c66 Participants 2018-12-26 21:58:14 +09:00
2d19436456 Open -> Push 2018-12-26 21:21:26 +09:00
152f3b1da3 Add processing overlay to lounge screen 2018-12-26 21:20:53 +09:00
7a431ed87f Update ParticipantInfo 2018-12-26 20:31:04 +09:00
869081ce9c Open -> Push 2018-12-26 20:21:30 +09:00
692f5c289d Move PartRoom calls 2018-12-26 20:12:51 +09:00