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
smoogipoo
a3b6a3981c
Use .Equals() override instead of manual type checks
2018-12-27 16:19:00 +09:00
Dean Herbert
67e200e1b2
Leaderboard design updates
2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4
Add + set ended room status
2018-12-27 13:32:44 +09:00
Dean Herbert
bfbd7e5106
Merge remote-tracking branch 'upstream/master' into timeshift-wip
2018-12-26 22:42:24 +09:00
Dean Herbert
bb502769c7
Fix enum
2018-12-26 22:42:17 +09:00
Dean Herbert
cc1f3d54b0
Fix looping failure
2018-12-26 22:37:09 +09:00
Dean Herbert
6b7b0af2e4
Temporary fix for participant count being nullable
2018-12-26 22:25:15 +09:00
Dean Herbert
f6aa6e6b3c
Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
2018-12-26 22:16:41 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
smoogipoo
e7310a16c7
Fix playlist not updating correcly
2018-12-26 22:14:49 +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
Dean Herbert
fb15806c98
Merge branch 'master' into fix-webrequest-cancellation
2018-12-26 21:21:29 +09:00
smoogipoo
2d19436456
Open -> Push
2018-12-26 21:21:26 +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
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
smoogipoo
bee4e8ad28
Fix cancelled webrequests triggering exceptions
2018-12-26 21:17:10 +09:00
Dean Herbert
171287591c
Merge branch 'updateable-beatmap-sprite' into timeshift-wip
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
# osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +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
e317b047f8
Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite
2018-12-26 18:49:41 +09:00
Dean Herbert
edfb027ff2
Update framework
2018-12-26 18:49:33 +09:00
Dean Herbert
63847890d1
Add better messaging when connecting or failing
2018-12-26 18:07:33 +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
smoogipoo
aeb2186539
Fix api get user request never failing
2018-12-26 16:06:39 +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
Dean Herbert
c902c1587a
Add tests and modify fallback logic
2018-12-25 19:17:32 +09:00
smoogipoo
96c9e5f209
Make DefaultBeatmap readonly
2018-12-25 18:34:45 +09:00
smoogipoo
6a5f0eca18
Fix various elements flashing
2018-12-25 18:07:50 +09:00
smoogipoo
1dd2a4e368
Fix host info not working
2018-12-25 18:07:19 +09:00
Dean Herbert
9542e3e24a
Add Updateable beatmap sprite
2018-12-25 18:04:13 +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
Dean Herbert
c6b37c45b5
Merge pull request #3902 from smoogipoo/disable-chat-avatar-click
...
Disable avatar clicks in chat tabs
2018-12-22 20:11:01 +09:00
smoogipoo
40db23ff4c
Disable avatar clicks in chat tabs
2018-12-22 19:30:52 +09:00
smoogipoo
30dbc36fce
Don't clear username on logout
2018-12-22 17:54:19 +09:00
smoogipoo
0757beb3b8
Test for null before loading
2018-12-22 17:54:08 +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
7e97d37df5
Merge remote-tracking branch 'upstream/master' into modular-results-screen
2018-12-22 16:20:39 +09:00
Dean Herbert
a35d9178f0
Quick rename
2018-12-22 16:20:29 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat
2018-12-22 16:07:27 +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
0e9991b81a
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 15:36:36 +09:00
Dean Herbert
e3308010c0
Merge pull request #3898 from peppy/leaderboard-modularity
...
Leaderboard modularity
2018-12-22 15:36:12 +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
29fd1719da
Merge pull request #3896 from peppy/backwards-drawable-date
...
Allow DrawableDate to be used to display future dates
2018-12-22 15:29:05 +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
Dean Herbert
870d843fff
Fix username not displaying correctly in overlay
2018-12-22 14:40:55 +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
f47ac35522
Add click to avatar
2018-12-22 14:23:53 +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
d28c754256
Fix negative dates, and time moving in opposite direction
2018-12-22 14:06:50 +09:00
smoogipoo
86ce0b5519
Make DrawableDate adjustable
2018-12-22 14:06:44 +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
Dean Herbert
396caae0a9
Remove redundant newline
2018-12-21 19:01:19 +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
Dean Herbert
81104f4803
Make standalone chat reuse more code from main chat overlay
2018-12-21 17:54:12 +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
e15ff98915
Merge branch 'master' into improve-text-search
2018-12-19 20:45:00 +09:00
Dean Herbert
8d458b0b6e
Update framework version
2018-12-19 19:45:50 +09:00
smoogipoo
36f6b4fc3f
Hook up participated filter
...
Very early stages, implementation will change.
2018-12-19 18:02:05 +09:00
smoogipoo
c86d9533bd
Add PollImmediately()
2018-12-19 18:01:21 +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
9d8170efa0
Only go into failing state if previously online
2018-12-19 14:32:43 +09:00
Dan Balasescu
02b95d3175
Merge branch 'master' into simplify-api-requests
2018-12-19 14:17:48 +09:00
Dean Herbert
067b448617
Merge branch 'master' into do_not_delete_replay_on_import
2018-12-19 13:50:04 +09:00
smoogipoo
a8d88dea3b
Display time remaining in the room
2018-12-19 13:07:56 +09:00
smoogipoo
224e644aa1
Fix negative dates, and time moving in opposite direction
2018-12-19 13:07:43 +09:00
smoogipoo
b89a6bea4c
Make DrawableDate adjustable
2018-12-19 12:44:51 +09:00
smoogipoo
2c000a9a1d
Disallow starting gameplay if there's not enough time in the room
2018-12-19 10:52:15 +09:00