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
smoogipoo
1051584f0f
Fix room duration not being set
2018-12-19 10:51:54 +09:00
Styphix
bacc07f5ec
Changed OsuFocusedOverlayContainer
to WaveOverlayContainer
from ChannelSelectionOverlay
...
Not sure what colour i shouldve gone for but im certain that this should be fine
2018-12-18 19:44:31 -05:00
Roman Kapustin
4a1af67893
Do not delete file on import failure
2018-12-18 22:49:53 +03:00
Dean Herbert
6088612a26
Remove all retry logic and simplify overall handling of API requests
2018-12-18 20:20:17 +09:00
smoogipoo
72d1ba897f
Reorder tabs
2018-12-18 18:29:13 +09:00
smoogipoo
4050cb88ea
Fix potential nullref
2018-12-18 18:09:54 +09:00
smoogipoo
3cdeeb7ac5
Add forceful set helper methods in OsuGame
2018-12-18 18:09:46 +09:00
smoogipoo
e4e1bde5da
Fix playlist events running too early
...
Screens are async loaded
2018-12-18 17:08:07 +09:00
smoogipoo
aabe6c68f5
Fix looping not working
2018-12-18 17:07:47 +09:00
smoogipoo
2f15d10029
Play track while in the multiplayer lobby
2018-12-18 14:45:35 +09:00
smoogipoo
5a8b255bd8
Directly bypass beatmap/ruleset restrictions
2018-12-18 14:17:20 +09:00
smoogipoo
8d640cdc25
Fix leaderboard not being refreshed when finishing gameplay
2018-12-18 12:56:16 +09:00
smoogipoo
7c4fd8ca60
Cleanup room definition
2018-12-17 14:46:43 +09:00
smoogipoo
cc68cf2f95
Implement duration
2018-12-17 14:44:54 +09:00
Dean Herbert
00998d5443
Fix web requests not getting correctly handled on first connection
2018-12-17 14:29:11 +09:00
smoogipoo
279891ae08
Change "apply" button to say "create" instead
2018-12-17 13:55:42 +09:00
smoogipoo
84552b5cee
Refresh leaderboard when returning to lobby
2018-12-17 11:51:28 +09:00
smoogipoo
bf8aae8d9b
Boot player back to lobby if token request fails
2018-12-17 11:51:17 +09:00
smoogipoo
2fd2425cc4
Fix playlist deserialisation for creating rooms
2018-12-17 11:05:03 +09:00
Dean Herbert
e9f661bbf5
Merge branch 'master' into user-registration
2018-12-17 05:05:06 +09:00
Dean Herbert
eec5afa382
Change inspection and add redundant parenthesis to appease codefactor
2018-12-15 16:37:37 +09:00
Dean Herbert
3892454ecc
Improve the way text search works at song select
2018-12-15 16:34:48 +09:00
smoogipoo
983a45c4d8
Fix invalid value
2018-12-14 21:21:02 +09:00
smoogipoo
9726eea0d0
Basic score submission implementation
2018-12-14 21:09:17 +09:00
smoogipoo
e8007ac37f
Implement multiplayer room leaderboard
2018-12-14 21:08:55 +09:00
Dean Herbert
0b5f3c00bf
Revert "Fix WaveOverlayContainer always being present"
...
This reverts commit a6fc128094
.
2018-12-14 20:50:27 +09:00
Dean Herbert
13cabac386
Update in line with framework changes
2018-12-14 19:56:21 +09:00
smoogipoo
d9fc7c7d66
Separate out Leaderboard into BeatmapLeaderboard
2018-12-14 19:51:27 +09:00
Dean Herbert
2fe642a12b
Merge branch 'master' into master
2018-12-14 19:49:08 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration
2018-12-14 19:45:27 +09:00
Dean Herbert
79ae5e6fa5
Merge pull request #3855 from peppy/fix-waver-overlay-presence
...
Fix WaveOverlayContainer always being present
2018-12-14 19:42:01 +09:00
Dean Herbert
dfe60f6318
Merge pull request #3823 from peppy/netcoreapp22
...
Update projects to target .NET core 2.2
2018-12-14 19:41:52 +09:00
Dean Herbert
ec793bd708
Merge pull request #3848 from peppy/polling-component
...
Polling component
2018-12-14 19:41:36 +09:00
Dean Herbert
59a56b1a56
Merge pull request #3850 from peppy/fix-hitsound-change-crash
...
Fix crash when changing beatmap toggles at loading screen
2018-12-14 19:41:13 +09:00
Dean Herbert
578f7ff459
Merge pull request #3852 from peppy/fix-exit-crash
...
Fix crash on exiting player during results transition
2018-12-14 19:40:54 +09:00
Dean Herbert
4fb9a39038
Merge branch 'master' into fix-waver-overlay-presence
2018-12-14 19:40:36 +09:00
Dean Herbert
38fd35a0cf
Add polling time to ctor
2018-12-14 19:17:21 +09:00
Dean Herbert
64626f62db
Update framework
2018-12-14 19:02:25 +09:00
smoogipoo
de0fc2a0de
Fix beatmap + ruleset being changeable
2018-12-14 17:35:18 +09:00
smoogipoo
5f0069eb83
Fix incorrect ruleset being sent to API
2018-12-14 17:35:05 +09:00
smoogipoo
edefdb18f8
Fix beatmap not having any mods when going into play
2018-12-14 16:16:38 +09:00
smoogipoo
e3ad226075
Use the local beatmap if existing, fixing player not loading objects
2018-12-14 16:11:00 +09:00
Dean Herbert
9072af9792
Move bulk of method into separate private method with minor clean-ups
2018-12-14 15:48:34 +09:00
Dean Herbert
a6fc128094
Fix WaveOverlayContainer always being present
2018-12-14 15:41:05 +09:00
smoogipoo
83bf37a302
Enable/disable the view beatmap + ready buttons based on beatmap presence
2018-12-14 15:04:04 +09:00
smoogipoo
28192aef90
Fix nullref
2018-12-14 15:03:49 +09:00
smoogipoo
3de65238a2
Completely hide the select beatmap button for now
2018-12-14 14:33:50 +09:00
smoogipoo
b83f99d90a
Fix up header sizing + styling
2018-12-14 14:30:39 +09:00
smoogipoo
c9c04a6200
Fix ToBeatmap not using the correct metadata
...
Metadata is always come from the API via the beatmap set.
2018-12-14 13:43:52 +09:00
smoogipoo
56fd4b95cd
Fix mod/beatmap selection not always working
2018-12-14 13:38:27 +09:00
smoogipoo
2e767a5292
Fix incorrect acronym
2018-12-14 13:38:13 +09:00
Dean Herbert
a1543905ae
Merge branch 'master' into fix-api-failure-fail
2018-12-14 13:19:09 +09:00
smoogipoo
8e6a85058b
Fix playlist-related errors
2018-12-14 12:35:05 +09:00
Dean Herbert
eb0a09576a
Merge branch 'master' into polling-component
2018-12-13 20:07:49 +09:00
smoogipoo
91f6b08479
Merge branch 'timeshift-api-integration'
2018-12-13 18:38:22 +09:00
smoogipoo
680a3e2aa4
Update with proper playlist usage
2018-12-13 18:38:03 +09:00
smoogipoo
2aafaf9ce2
Merge branch 'timeshift-api-integration'
2018-12-13 17:07:39 +09:00
smoogipoo
eb0e9c0bb1
Merge branch 'match-mod-display'
...
# Conflicts:
# osu.Game/Screens/Multi/Match/Components/Info.cs
# osu.Game/osu.Game.csproj
2018-12-13 17:07:31 +09:00
smoogipoo
ca87b42758
Merge branch 'timeshift-player'
...
# Conflicts:
# osu.Game/Screens/Multi/Multiplayer.cs
2018-12-13 17:06:44 +09:00
smoogipoo
208273f16a
Merge branch 'timeshift'
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-13 17:06:20 +09:00
Dean Herbert
71e5ce59da
Fix crash on exiting player during results transition
2018-12-13 16:23:51 +09:00
smoogipoo
264bd0e2aa
Fix invalid room values
2018-12-13 16:06:30 +09:00
Dean Herbert
ac0fc6236c
Fix crash when changing beatmap toggles at loading screen
2018-12-13 14:51:18 +09:00
Dean Herbert
4fc9902cd2
Fix reverting to default skin via settings button causing a hard crash
2018-12-12 21:30:21 +09:00
smoogipoo
bac4f42eac
Fix backgrounds not quite working
2018-12-12 19:34:37 +09:00
Ivan Pavluk
d5437f7b4b
Merge branch 'master' into master
2018-12-12 17:24:52 +07:00
Ivan Pavluk
28b033bd99
Autodetect LowestSuccessfulHitResult
2018-12-12 17:15:59 +07:00
smoogipoo
450e4cd223
Hook up API
2018-12-12 19:04:11 +09:00
smoogipoo
87ebb00f1c
Make Target abstract (should absolutely always be set)
2018-12-12 19:03:27 +09:00
smoogipoo
9af2b49c01
Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
6123a11b67
Use RoomID for creation
2018-12-12 16:20:11 +09:00
smoogipoo
439d741dee
Implement basic api structure for rooms
2018-12-12 16:06:56 +09:00
Ivan Pavluk
e49e2fda9e
Rename SuccessfulHitResult->LowestSuccessfulHitResult
2018-12-12 13:24:58 +07:00
Dean Herbert
ffb91b4afc
Update docstring
...
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:11:03 +07:00
Dean Herbert
d86cbf66a9
Update docstring
...
Co-Authored-By: pavlukivan <pavlukivan@outlook.com>
2018-12-12 13:10:47 +07:00
smoogipoo
170955110f
Add mods to the match info
2018-12-12 14:38:03 +09:00
smoogipoo
6661b5870f
Merge branch 'songselect-mods' into match-mod-display
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 14:13:37 +09:00
Dean Herbert
14af450ecb
Merge branch 'master' into songselect-mods
2018-12-12 13:37:04 +09:00
smoogipoo
49dd6ae9b0
Move a lot more of PlaySongSelect into SongSelect
2018-12-12 13:21:44 +09:00
smoogipoo
497f431366
Implement RoomManager and RoomsContainer
...
Reduces logic from LoungeScreen
2018-12-11 19:07:40 +09:00
smoogipoo
bf3f5ab685
Change ready button to "Start" and make it enter player
2018-12-11 17:32:01 +09:00
Dean Herbert
ea4dce8454
Add a polling component model
2018-12-10 21:08:14 +09:00
smoogipoo
1ac615b490
Renamespace
2018-12-10 19:27:25 +09:00
smoogipoo
cd41c45686
Disable select beatmap button after room is created
2018-12-10 19:03:22 +09:00
smoogipoo
3c44f9e4f1
Make select beatmap button into a triangle button
2018-12-10 18:50:52 +09:00
smoogipoo
3f64cfc1c6
Don't add rooms to lounge until they're actually created
2018-12-10 18:35:08 +09:00
smoogipoo
ca544ef3fe
Adjust match creation process
2018-12-10 18:25:32 +09:00
smoogipoo
77193eeea4
Move from lobby into match for creation process
2018-12-10 18:00:57 +09:00
smoogipoo
3b688c702c
Use graying rather than alpha
2018-12-10 17:06:34 +09:00
smoogipoo
c7970e5425
Cleanup handling of readonly fields
2018-12-10 16:50:00 +09:00
Ivan Pavluk
a62b105fb5
Fix formatting
2018-12-10 05:06:18 +00:00