Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1
2019-02-28 15:57:51 +09:00
Joehu
2241e1af9d
Use ToQuantity for words with number prefixes
2019-02-27 21:55:45 -08:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +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
4db5531e4b
Replace copy-constructor/method with extension method
2019-02-20 19:32:30 +09:00
smoogipoo
dbfa95b9e7
Made medium the default font weight
2019-02-20 16:52:36 +09:00
smoogipoo
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
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dean Herbert
88ffc78103
Restructure
2019-02-11 19:11:34 +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
42cd55e0d7
Move current room to multiplayer
2019-02-08 14:57:51 +09:00
smoogipoo
17fdfc15d9
Fix room title in the breadcrumbs
2019-02-07 20:09:49 +09:00
smoogipoo
1c2450a95a
Fix up room inspector status
2019-02-07 17:59:14 +09:00
smoogipoo
1e0135af6f
Move StatusColouredContainer into a more public location
2019-02-07 17:52:40 +09:00
smoogipoo
2d61548251
Fix room name being coloured
2019-02-07 16:45:36 +09:00
smoogipoo
a9aa22c97b
Remove ShadowModel requirement
2019-02-06 13:52:48 +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
smoogipoo
37c1f5a824
Split polling logic from RoomManager, now a container
2019-02-05 15:38:19 +09:00
smoogipoo
b5d187c4af
Fix post-merge errors
2019-01-29 21:27:32 +09:00
smoogipoo
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
smoogipoo
e1e7759e0f
Re-implement MultiplayerSubScreen
2019-01-25 19:32:37 +09:00
Dean Herbert
260034a80e
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
2019-01-25 19:20:29 +09:00
smoogipoo
da135346b2
Fix screen titles
2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1
Remove MultiplayerSubScreen and fix multiplayer crashes
2019-01-25 18:26:04 +09:00
Dean Herbert
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +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
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
ProgrammaticNajel
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
Dean Herbert
5269ca31be
Merge branch 'master' into fix-room-inspector-cover
2019-01-17 21:49:25 +09:00
Dean Herbert
59f7c5a26e
Fix room inspector cover not resetting when no room selected
2019-01-17 18:44:22 +09:00
Dean Herbert
ba9cdf2ce2
Add null check to fix crash on deselecting multiplayer room
2019-01-17 18:17:47 +09:00
ekrctb
b6fb3a5c05
Cancel request on disposal for RoomInspector
2019-01-17 15:14:30 +09:00
Dean Herbert
2dc185f249
Display avatars rather than full scores
2019-01-09 15:27:08 +09:00
smoogipoo
2a4c91a6ab
Remove unused using
2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58
Show room leaderboard instead in the lounge
2019-01-08 19:24:55 +09:00
Dean Herbert
f6018294b5
Update framework
2019-01-07 18:50:27 +09:00
smoogipoo
a7db0bbb91
Sort rooms based on their API position
2018-12-28 01:45:19 +09:00
smoogipoo
eaba9e1378
Fix mode icon not being updated for correct ruleset
2018-12-27 18:16:30 +09:00
smoogipoo
ea1309e768
Fix missing bind
2018-12-27 17:15:43 +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