3525 Commits

Author	SHA1	Message	Date
Dean Herbert	b373d78143	Add slight easing	2019-01-22 09:47:51 +09:00
Dean Herbert	25b5bbcd8f	Merge branch 'master' into score-panel-layout	2019-01-22 09:43:37 +09:00
Christian Kamphausen	86581feb4a	Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H	2019-01-22 01:29:58 +01:00
chrisny286	d7d2e2fe44	trimmed whitespace	2019-01-21 19:22:19 +01:00
chrisny286	65fd69c817	Update HUDOverlay.cs ... separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container	2019-01-21 19:10:29 +01:00
chrisny286	fb51578df3	Update PlayerSettingsOverlay.cs ... Framework renamed this variable so it needs to be renamed here too.	2019-01-21 17:19:40 +01:00
ekrctb	e74f0057bd	Automatically layout based on score display width	2019-01-21 17:07:56 +09:00
Shane Woolcock	fa6dd8c99e	Code sanity	2019-01-20 19:03:06 +10:30
Shane Woolcock	521b11dfcb	Use QuadBatch rather than LinearBatch of quads for LogoVisualisation ... GL_QUADS is deprecated, and is not supported at all on OpenGL ES. This fixes the logo visualisation not drawing on iOS.	2019-01-20 18:51:17 +10:30
Dean Herbert	5269ca31be	Merge branch 'master' into fix-room-inspector-cover	2019-01-17 21:49:25 +09:00
Dean Herbert	1d40d88f82	Merge branch 'master' into add-room-null-check	2019-01-17 21:34:25 +09:00
Dean Herbert	59f7c5a26e	Fix room inspector cover not resetting when no room selected	2019-01-17 18:44:22 +09:00
Dean Herbert	ba9cdf2ce2	Add null check to fix crash on deselecting multiplayer room	2019-01-17 18:17:47 +09:00
Dean Herbert	491537b8ba	Add fade duration ... Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.	2019-01-17 18:13:05 +09:00
Dean Herbert	c1f5c0edc9	Merge branch 'master' into hide-multiplayer-match-room-tab	2019-01-17 18:02:17 +09:00
ekrctb	2bc3464802	Hide Room tab when Settings tab is active	2019-01-17 17:27:34 +09:00
ekrctb	f982b6da55	Don't hide 'hold for menu' even hud is hidden	2019-01-17 16:49:04 +09:00
Dean Herbert	99c963c56a	Merge branch 'master' into cancel-request-on-disposal	2019-01-17 15:29:49 +09:00
ekrctb	b6fb3a5c05	Cancel request on disposal for RoomInspector	2019-01-17 15:14:30 +09:00
Dean Herbert	2ab0c4632e	Merge branch 'master' into menu-background-skinning	2019-01-17 14:23:03 +09:00
Dan Balasescu	75113db438	Merge branch 'master' into fix-skip-button-scaling	2019-01-16 16:37:37 +09:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Dean Herbert	e2dd025225	Fix scaling of SkipOverlay when UI scale is adjusted ... Closes #4040.	2019-01-11 16:54:42 +09:00
Min	29e8c21c46	Merge branch 'master' into menu-background-skinning	2019-01-11 11:36:20 +09:00
Dean Herbert	aa68bbc1d9	Merge branch 'master' into fix-match-select-crash	2019-01-10 15:40:03 +09:00
Dean Herbert	2dc185f249	Display avatars rather than full scores	2019-01-09 15:27:08 +09:00
Dean Herbert	0bf9e9b86b	Merge branch 'master' into lounge-leaderboard	2019-01-09 10:28:55 +09:00
Dean Herbert	958840fe17	Merge branch 'master' into fix-sliderbar	2019-01-08 21:23:34 +09:00
Dean Herbert	6ce08312b2	Merge branch 'master' into fix-match-select-crash	2019-01-08 20:29:55 +09:00
smoogipoo	2a4c91a6ab	Remove unused using	2019-01-08 19:26:24 +09:00
smoogipoo	122fc2de58	Show room leaderboard instead in the lounge	2019-01-08 19:24:55 +09:00
smoogipoo	b17b88d071	Fix null beatmap possibly being selected	2019-01-08 18:06:46 +09:00
smoogipoo	38a3ccc817	Use value where applicable	2019-01-08 16:31:44 +09:00
smoogipoo	8692be9de3	Fix sliderbar not working correctly with TransferValueOnCommit = true	2019-01-08 16:07:54 +09:00
Dean Herbert	70d644406f	Merge remote-tracking branch 'origin/update-framework' into letterboxing ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs	2019-01-07 18:53:53 +09:00
Dean Herbert	74539b5e5c	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09:00
Dean Herbert	49ba4e5a14	Merge branch 'master' into update-framework	2019-01-07 18:51:54 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Dean Herbert	7d1163a7d2	Remove unnecessary null check	2019-01-04 15:49:23 +09:00
Dean Herbert	c528a3896d	Formatting and naming	2019-01-04 15:34:32 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	b6dc6c4a74	Merge branch 'master' into do_not_use_local_user_for_autoplay_score	2019-01-04 13:11:17 +09:00
Dean Herbert	2d405bfc43	Add back options for 3 and 7 day long rooms	2019-01-02 16:33:52 +09:00
smoogipoo	72482aff8d	Whoops	2018-12-28 01:48:13 +09:00
smoogipoo	a7db0bbb91	Sort rooms based on their API position	2018-12-28 01:45:19 +09:00
Dean Herbert	12a93af156	Merge pull request #3939 from smoogipoo/fix-multi-mods ... Fix plays with mods not submitting	2018-12-27 22:20:10 +09:00
smoogipoo	a62405d82d	Fix plays with mods not submitting	2018-12-27 22:17:03 +09:00
Dean Herbert	2d1736e477	Merge pull request #3936 from smoogipoo/fix-multi-mods ... Ensure mods are set prior to starting play	2018-12-27 22:04:35 +09:00
smoogipoo	101fdf993e	Ensure mods are set prior to starting play	2018-12-27 21:59:43 +09:00
Dean Herbert	5977fc838f	Limit available durations for the time being	2018-12-27 21:59:08 +09:00
smoogipoo	50b51a168e	Always submit standardised scores	2018-12-27 21:12:32 +09:00
Dean Herbert	31baf0086f	Optional idle tracker	2018-12-27 20:17:27 +09:00
Dean Herbert	1ce33cb6da	Adjust polling rate based on current screen and idle state	2018-12-27 20:06:07 +09:00
smoogipoo	eaba9e1378	Fix mode icon not being updated for correct ruleset	2018-12-27 18:16:30 +09:00
smoogipoo	9a5630b3d5	Fix working beatmap not being updated	2018-12-27 18:16:30 +09:00
Dean Herbert	d6c53e3851	Cancel old web requests when changing filter modes	2018-12-27 18:09:42 +09:00
smoogipoo	b0e8561ad3	Fix ruleset not changing correctly	2018-12-27 17:48:10 +09:00
smoogipoo	dae710f9a6	Make leaderboard top not fade by default	2018-12-27 17:29:55 +09:00
phosphene47	3c677970cd	Add menu background skinning for supporters	2018-12-27 17:25:28 +09:00
smoogipoo	ea1309e768	Fix missing bind	2018-12-27 17:15:43 +09:00
smoogipoo	bd0576537e	Forcefully exit multiplayer if API loses connectivity	2018-12-27 17:12:58 +09:00
smoogipoo	f70e60747f	Remove option for 1-minute duration	2018-12-27 16:54:14 +09:00
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
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	cc1f3d54b0	Fix looping failure	2018-12-26 22:37:09 +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
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
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	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
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
smoogipoo	1dd2a4e368	Fix host info not working	2018-12-25 18:07:19 +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
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	a35d9178f0	Quick rename	2018-12-22 16:20:29 +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	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	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
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
smoogipoo	fa2bc16140	Remove participants, add match chat	2018-12-21 14:01:11 +09:00
smoogipoo	14879acd83	Fix possible nullref	2018-12-21 13:26:50 +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
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	6a76e335c7	Linkify everything	2018-12-20 20:03:45 +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
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
smoogipoo	36f6b4fc3f	Hook up participated filter ... Very early stages, implementation will change.	2018-12-19 18:02:05 +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	a8d88dea3b	Display time remaining in the room	2018-12-19 13:07:56 +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
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	cc68cf2f95	Implement duration	2018-12-17 14:44:54 +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	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
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
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
smoogipoo	83bf37a302	Enable/disable the view beatmap + ready buttons based on beatmap presence	2018-12-14 15:04:04 +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	56fd4b95cd	Fix mod/beatmap selection not always working	2018-12-14 13:38:27 +09:00
smoogipoo	8e6a85058b	Fix playlist-related errors	2018-12-14 12:35:05 +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	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	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	170955110f	Add mods to the match info	2018-12-12 14:38:03 +09:00