Commit Graph

477 Commits

Author SHA1 Message Date
6661b5870f Merge branch 'songselect-mods' into match-mod-display
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 14:13:37 +09:00
77193eeea4 Move from lobby into match for creation process 2018-12-10 18:00:57 +09:00
94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
e7d7e00516 Better disabling of various controls 2018-12-05 17:01:14 +09:00
ec83790734 Add timeshift game type 2018-12-04 18:58:45 +09:00
e22cefc27d Immediately select newly-created rooms 2018-12-04 12:49:22 +09:00
6a28e8c696 Add settings to lounge 2018-12-03 18:30:26 +09:00
af3ef9a089 Fix some data types on ScoreInfo 2018-11-30 20:43:38 +09:00
059e9e180b Apply review 2018-11-30 18:07:15 +09:00
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
84f3d4f48d Fix nullref 2018-11-30 17:15:32 +09:00
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
271dcded3c Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
f42d4a9382 Add wildcard scope to oauth requests 2018-11-28 19:02:23 +09:00
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
38ef1d1f03 Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
efdad3a3a7 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection 2018-11-26 16:12:55 +09:00
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
a144e97568 Fix crash on creating two new PM channels 2018-11-22 18:27:22 +09:00
d1ec9fc294 Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence 2018-11-22 13:04:32 +09:00
4f41512265 Lowercase the references to joinedChannel and availableChannels 2018-11-21 23:21:27 +01:00
21c9353fee Remove not used usings 2018-11-21 23:15:45 +01:00
a14b6ac9df Replace ObservableCollection with BindableCollection 2018-11-21 23:15:44 +01:00
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01:00
2126cf0d9a Fix join process for PMs being incorrect 2018-11-21 20:44:41 +09:00
b31efb7bb9 Fix PM channel type 2018-11-21 20:34:36 +09:00
d677921680 Remove excess newline 2018-11-21 18:53:50 +09:00
7755242a43 Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
88f82eb722 Fix instabilities in channel join logic 2018-11-21 17:15:15 +09:00
4cde66240d Fix default channels not being joined 2018-11-21 17:15:15 +09:00
ab2c969122 Add private channel types 2018-11-21 12:58:45 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
23a446bab2 Add support for all channel types 2018-11-20 15:03:55 +09:00
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
9a9d5e60af More refactors 2018-11-14 13:59:02 +09:00
c4769f6802 Refactors 2018-11-14 13:19:51 +09:00
72ae22b0c4 Add support for creating new PM conversations 2018-11-13 17:24:11 +09:00
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
7401fabb5d Extract external link opening to the ExternalLinkOpener class 2018-10-23 23:03:00 +03:00
94093ac948 Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
3cacc11af1 Fix outdated API variable 2018-09-28 19:33:30 +09:00
e1c187b641 Merge remote-tracking branch 'origin/update-chat-api' into update-framework 2018-09-28 18:23:09 +09:00