16470 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
Dean Herbert	e174fa2d3e	Merge pull request #4226 from smoogipoo/cmc-rooms ... Use CachedModelDependencyContainer for multiplayer	2019-02-10 10:30:33 +09:00
Dean Herbert	a30d3739cf	Merge remote-tracking branch 'upstream/master' into cmc-rooms	2019-02-08 18:45:39 +09:00
Dean Herbert	f52cac966b	Fix multiple blank lines	2019-02-08 18:45:32 +09:00
Dean Herbert	6c4d289901	Pass item rather than ID	2019-02-08 18:33:49 +09:00
Dan Balasescu	7ec0b4ba77	Fix nullref during room creation (#4228)	2019-02-08 17:53:01 +09:00
Dean Herbert	e8aed6b686	Update framework	2019-02-08 17:38:18 +09:00
Dan Balasescu	959b1ac845	Fix potential nullref when exiting multiplayer (#4227) ... Fixes https://github.com/ppy/osu/issues/3954	2019-02-08 17:28:00 +09:00
smoogipoo	7aca0f4a1d	Fix failing test cases	2019-02-08 16:08:23 +09:00
smoogipoo	ee5ff283d1	Remove compiler warnings	2019-02-08 16:02:00 +09:00
smoogipoo	febcd7d7c0	Remove currentRoom from RoomManager	2019-02-08 15:46:16 +09:00
smoogipoo	fdd37dbc4b	Merge remote-tracking branch 'origin/master' into cmc-rooms	2019-02-08 15:44:33 +09:00
smoogipoo	b5cc0ec8db	Update framework	2019-02-08 15:44:11 +09:00
smoogipoo	5643dc2e99	Remove redundant qualifiers	2019-02-08 15:44:05 +09:00
smoogipoo	6fe1f57236	Fix crash when start button is repeatedly pressed	2019-02-08 15:39:11 +09:00
smoogipoo	99a7ccc01a	Slight cleanup in multiplayer	2019-02-08 15:38:05 +09:00
smoogipoo	43240ea85e	Fix playlist issues with room creation	2019-02-08 15:23:03 +09:00
smoogipoo	42cd55e0d7	Move current room to multiplayer	2019-02-08 14:57:51 +09:00
smoogipoo	7f13e3c5f7	Directly resolve the filter bindable	2019-02-08 13:02:17 +09:00
smoogipoo	990bd44ca2	Combine roommanager and roompollingcomponent	2019-02-08 13:01:10 +09:00
smoogipoo	17fdfc15d9	Fix room title in the breadcrumbs	2019-02-07 20:09:49 +09:00
smoogipoo	1c2450a95a	Fix up room inspector status	2019-02-07 17:59:14 +09:00
smoogipoo	1e0135af6f	Move StatusColouredContainer into a more public location	2019-02-07 17:52:40 +09:00
smoogipoo	2d61548251	Fix room name being coloured	2019-02-07 16:45:36 +09:00
Dan Balasescu	7ee8115eaa	Merge pull request #4220 from HoLLy-HaCKeR/diffcalc-proper-attributes ... Use correct DifficultyAttributes where possible	2019-02-07 12:42:31 +09:00
Dan Balasescu	5b4933ca60	Merge branch 'master' into diffcalc-proper-attributes	2019-02-07 12:30:55 +09:00
Dan Balasescu	8402c4c4ef	Merge pull request #4221 from Morilli/patch-1 ... Fix typo in README.md	2019-02-07 12:20:26 +09:00
Moritz Bender	6e2ecd5fcc	Fix typo in README.md	2019-02-06 21:59:47 +01:00
HoLLy	ae9d5f999c	Use correct DifficultyAttributes where possible	2019-02-06 21:28:42 +01:00
smoogipoo	4f86fe92ea	Fix match settings not showing	2019-02-06 18:50:43 +09:00
ProgrammaticNajel	9f8e724a76	Fix background being cut off at the top of the screen (#4207) ... Fix background being cut off at the top of the screen	2019-02-06 18:14:33 +09:00
smoogipoo	3207983a1c	Fix current room being set to null when parted	2019-02-06 15:12:40 +09:00
smoogipoo	a9aa22c97b	Remove ShadowModel requirement	2019-02-06 13:52:48 +09:00
Dan Balasescu	0d6ce3b8bb	Merge pull request #4213 from ekrctb/vscode-task-restore-fix ... Fix VSCode Restore task	2019-02-06 12:12:30 +09:00
ekrctb	0e3a087ed3	Fix VSCode Restore task	2019-02-06 12:02:04 +09:00
Dan Balasescu	43d66b2e90	Merge pull request #4209 from peppy/fix-combo-color-fallbacks ... Fix combo colour fallbacks when skin is not providing any	2019-02-06 11:38:59 +09:00
smoogipoo	594dffba41	Fix a few cases of missed instant invocation	2019-02-05 19:11:20 +09:00
smoogipoo	aac371ba6e	Use CMC for all of multiplayer	2019-02-05 19:00:08 +09:00
Dean Herbert	5b1f111922	Rollback other fallthrough regressions	2019-02-05 18:14:43 +09:00
Dean Herbert	8ae2861ed6	Fix class name	2019-02-05 18:09:15 +09:00
Dean Herbert	a6b2e9eb0b	Remove unused pieces of ini	2019-02-05 18:08:27 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
smoogipoo	be51ee4ed5	Implement MultiplayerComposite, replaces RoomBindings	2019-02-05 16:14:37 +09:00
smoogipoo	d9537017c8	Use CMC in the Multiplayer screen	2019-02-05 16:03:05 +09:00
smoogipoo	37c1f5a824	Split polling logic from RoomManager, now a container	2019-02-05 15:38:19 +09:00
Dan Balasescu	e33277bd76	Merge pull request #4203 from EVAST9919/keybindings-settings-groups ... Use sidebar in key bindings overlay	2019-02-05 12:11:29 +09:00
Dan Balasescu	84ab16c7c8	Merge branch 'master' into keybindings-settings-groups	2019-02-05 11:42:53 +09:00
Dean Herbert	a47023b607	Merge pull request #4205 from smoogipoo/fix-background-fade-2 ... Fix background not being faded correctly	2019-02-04 22:43:10 +09:00
Dean Herbert	216030fe64	Merge branch 'master' into fix-background-fade-2	2019-02-04 22:32:50 +09:00
Dan Balasescu	ea7b56c8b1	Merge pull request #4192 from UselessToucan/fix_song_rearranging_in_music_controller_playlist ... Add PlaylistItemHandle.HandlePositionalInput override	2019-02-04 17:05:43 +09:00