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
52c6d5bfd4
Move protected method down
2018-12-22 15:23:32 +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
Dean Herbert
23259b295c
Remove unnecessary using
2018-12-22 14:45: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
Dean Herbert
6bca344e56
Merge branch 'master' into add-alt-select-support
2018-12-21 14:32:24 +09:00
smoogipoo
1df4826a1d
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-21 14:14:17 +09:00
smoogipoo
6a9b0a0ba3
Fix initial messages not being received
2018-12-21 14:02:36 +09:00
smoogipoo
6b6629e9fd
Fix not posting to the correct channel
2018-12-21 14:02:29 +09:00
smoogipoo
fa2bc16140
Remove participants, add match chat
2018-12-21 14:01:11 +09:00
Dean Herbert
59452800ed
Update framework
2018-12-21 13:33:06 +09:00
smoogipoo
14879acd83
Fix possible nullref
2018-12-21 13:26:50 +09:00
smoogipoo
e27b7b0c0d
Cleanup
2018-12-21 13:06:11 +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
Dan Balasescu
3d4edd9121
Merge branch 'master' into standalone-chat
2018-12-21 12:31:33 +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
104a3c8ffc
Add click to avatar
2018-12-20 20:08:22 +09:00
smoogipoo
6a76e335c7
Linkify everything
2018-12-20 20:03:45 +09:00
smoogipoo
f8d25a1b6c
Add method to add arbitrary drawables as links
2018-12-20 20:01:58 +09:00
Dean Herbert
ef9d93ff6b
Remove mod multipliers
...
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d
Simplify changes to RulesetContainer
2018-12-20 19:35:32 +09:00
Dean Herbert
bc8b0485d8
Add textbox/posting support
2018-12-20 18:49:03 +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
Dean Herbert
65447d6f4a
Add optional parameters to target messages at a specific channel
2018-12-20 17:01:08 +09:00
Dean Herbert
3a13899ce1
Add stand-alone chat component
2018-12-20 16:54:49 +09:00
Dean Herbert
9177a45587
Merge branch 'master' into mod-fl2
2018-12-20 15:50:18 +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
Dean Herbert
8d458b0b6e
Update framework version
2018-12-19 19:45:50 +09:00