1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 14:37:25 +08:00
Commit Graph

554 Commits

Author SHA1 Message Date
smoogipoo
2fd2425cc4 Fix playlist deserialisation for creating rooms 2018-12-17 11:05:03 +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
smoogipoo
d9fc7c7d66 Separate out Leaderboard into BeatmapLeaderboard 2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration 2018-12-14 19:45:27 +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
38fd35a0cf Add polling time to ctor 2018-12-14 19:17:21 +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
smoogipoo
28192aef90 Fix nullref 2018-12-14 15:03:49 +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
680a3e2aa4 Update with proper playlist usage 2018-12-13 18:38:03 +09:00
smoogipoo
264bd0e2aa Fix invalid room values 2018-12-13 16:06:30 +09:00
smoogipoo
bac4f42eac Fix backgrounds not quite working 2018-12-12 19:34:37 +09: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
Dean Herbert
ea4dce8454 Add a polling component model 2018-12-10 21:08:14 +09:00
smoogipoo
77193eeea4 Move from lobby into match for creation process 2018-12-10 18:00:57 +09:00
Dean Herbert
7a703f9237 Fix API getting stuck in connecting state on some exceptions 2018-12-09 15:08:25 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dean Herbert
2f9de149dd Add constructor to create a PM channel from a User 2018-12-07 13:56:21 +09:00
Dean Herbert
ab27701ed1 Merge branch 'user-registration' of https://github.com/peppy/osu into user-registration 2018-12-06 17:11:57 +09:00
Dean Herbert
6ebe555838 Fix incorrect filename 2018-12-06 17:11:39 +09:00
Dean Herbert
9689c4fa17
Merge branch 'master' into user-registration 2018-12-06 17:06:43 +09:00
Dean Herbert
94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
Dean Herbert
1ca00f6662 Add registration API call and related error handling 2018-12-05 17:13:22 +09:00
smoogipoo
e7d7e00516 Better disabling of various controls 2018-12-05 17:01:14 +09:00
Dean Herbert
f3f449c749 wip 2018-12-05 13:08:35 +09:00
Dean Herbert
1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
smoogipoo
ec83790734 Add timeshift game type 2018-12-04 18:58:45 +09:00
smoogipoo
e22cefc27d Immediately select newly-created rooms 2018-12-04 12:49:22 +09:00
smoogipoo
6a28e8c696 Add settings to lounge 2018-12-03 18:30:26 +09:00
Dean Herbert
af3ef9a089 Fix some data types on ScoreInfo 2018-11-30 20:43:38 +09:00
Dean Herbert
059e9e180b Apply review 2018-11-30 18:07:15 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
84f3d4f48d Fix nullref 2018-11-30 17:15:32 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert
f42d4a9382 Add wildcard scope to oauth requests 2018-11-28 19:02:23 +09:00
smoogipoo
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
Dan Balasescu
38ef1d1f03
Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
smoogipoo
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
smoogipoo
efdad3a3a7 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection 2018-11-26 16:12:55 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
Dean Herbert
a144e97568 Fix crash on creating two new PM channels 2018-11-22 18:27:22 +09:00
smoogipoo
d1ec9fc294 Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence 2018-11-22 13:04:32 +09:00
miterosan
4f41512265 Lowercase the references to joinedChannel and availableChannels 2018-11-21 23:21:27 +01:00
miterosan
21c9353fee Remove not used usings 2018-11-21 23:15:45 +01:00
miterosan
a14b6ac9df Replace ObservableCollection with BindableCollection 2018-11-21 23:15:44 +01:00
smoogipoo
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01:00
Dean Herbert
2126cf0d9a Fix join process for PMs being incorrect 2018-11-21 20:44:41 +09:00
Dean Herbert
b31efb7bb9 Fix PM channel type 2018-11-21 20:34:36 +09:00
Dean Herbert
d677921680 Remove excess newline 2018-11-21 18:53:50 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
Dean Herbert
88f82eb722 Fix instabilities in channel join logic 2018-11-21 17:15:15 +09:00
Dean Herbert
4cde66240d Fix default channels not being joined 2018-11-21 17:15:15 +09:00
smoogipoo
ab2c969122 Add private channel types 2018-11-21 12:58:45 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
23a446bab2 Add support for all channel types 2018-11-20 15:03:55 +09:00
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
Dean Herbert
9a9d5e60af More refactors 2018-11-14 13:59:02 +09:00
Dean Herbert
c4769f6802 Refactors 2018-11-14 13:19:51 +09:00
Dean Herbert
72ae22b0c4 Add support for creating new PM conversations 2018-11-13 17:24:11 +09:00
Dean Herbert
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
Dean Herbert
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
Roman Kapustin
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
Roman Kapustin
7401fabb5d Extract external link opening to the ExternalLinkOpener class 2018-10-23 23:03:00 +03:00
Dean Herbert
94093ac948 Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
Dean Herbert
3cacc11af1 Fix outdated API variable 2018-09-28 19:33:30 +09:00
Dean Herbert
e1c187b641 Merge remote-tracking branch 'origin/update-chat-api' into update-framework 2018-09-28 18:23:09 +09:00
Dean Herbert
6a763334a1 Exit early as safety when no messages are received 2018-09-28 10:00:40 +09:00
Dean Herbert
6f3c8e9f8b Add explicit usage via attribute 2018-09-26 19:58:58 +09:00
Dean Herbert
1b77d9fd05 Merge branch 'update-chat-api' into update-framework 2018-09-26 19:50:23 +09:00
Dean Herbert
1fd2782dd4 Fix loading spinner not disappearing on empty channels 2018-09-26 19:15:02 +09:00
Dean Herbert
2436ee589d Remove incorrect API response 2018-09-26 19:13:38 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760 Update chat to work with new API version 2018-09-25 20:53:24 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
Dean Herbert
3c8c7a0459 Move ChannelManager to OsuGame
There's no reason for it to exist at OsuGameBase
2018-09-14 13:31:25 +09:00
Unknown
638a2e5ba8 populate Status for Beatmap + BeatmapSet
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
Dean Herbert
4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
Dean Herbert
0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
Dean Herbert
5d264fdbdd Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-09-11 13:56:57 +09:00
Dean Herbert
e6d5bbd886
Merge branch 'master' into multiplayer-room-settings 2018-09-09 22:40:08 +09:00
Dean Herbert
d05cd52d9a Run the queue faster if multiple requests are pending 2018-09-06 17:38:15 +09:00
Dean Herbert
562a792a99 Use thread instead of LongRunning for API 2018-09-01 13:19:22 +09:00
Dean Herbert
bf6fb1c380 Don't use ConcurrentQueue for API
This queue type can hold several references to already dequeued requests. In our usage, this can cause old api calls to hold references to already-disposed screens (and in turn, very large memory portions).
2018-09-01 12:56:09 +09:00
DrabWeb
52b157d072 Merge https://github.com/ppy/osu into multiplayer-room-settings 2018-08-14 11:16:25 -03:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages 2018-08-04 00:33:46 +02:00
Dean Herbert
b4ef3dd4dd Add LocalMessage 2018-08-03 20:03:43 +09:00
miterosan
b1e9a4fd24 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-07-29 23:28:34 +02:00
miterosan
8c0bcb8e3c Fix drawable crash and lload the inital messages of newly joined channels 2018-07-29 21:40:43 +02:00
Dean Herbert
da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00