15560 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	f29c6987d2	Merge pull request #3849 from peppy/fix-skin-default-revert ... Fix reverting to default skin via settings button causing a hard crash	2018-12-13 12:19:53 +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
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
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	b5c3b9e710	Merge pull request #3826 from smoogipoo/songselect-mods ... Move ModOverlay to SongSelect	2018-12-12 13:59:10 +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
Dean Herbert	7dc1f5b771	Add more tests	2018-12-11 20:12:30 +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
smoogipoo	be3a912d0b	Use UnbindFrom()	2018-12-10 13:48:12 +09:00
smoogipoo	41c7d10dff	Fix compilation issues (+ use updated framework)	2018-12-10 13:48:05 +09:00
smoogipoo	352a758f5c	Replace 3 occurrences of SpriteText.Current	2018-12-10 13:20:05 +09:00
Dan Balasescu	dc6574a9cc	Merge pull request #3833 from peppy/update-framework ... Update framework and other nuget packages	2018-12-07 21:11:59 +09:00
smoogipoo	feb1adb51d	Use bindable propagation rather than properties	2018-12-07 20:18:43 +09:00
Dean Herbert	2a2561e5c8	Update framework and otehr nuget packages	2018-12-07 19:39:54 +09:00
Dan Balasescu	57980e81e5	Merge pull request #3830 from peppy/channel-selector-on-none ... Select channel selector when no channel is selected	2018-12-07 18:13:31 +09:00
smoogipoo	29263d7154	Refactor bindable shenanigans in Match	2018-12-07 16:20:05 +09:00
smoogipoo	d68b4bb8e7	Remove custom action from DrawableRoom	2018-12-07 14:28:43 +09:00
Dean Herbert	d42c45c87e	Add full tests	2018-12-07 14:01:51 +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	2122966cd4	Show channel selector when no channels are joined	2018-12-07 13:26:31 +09:00
smoogipoo	10b526504a	Move ModOverlay to SongSelect	2018-12-06 19:29:18 +09:00
smoogipoo	c02150a19b	Make match header not fade when beatmap changes	2018-12-06 18:31:12 +09:00
smoogipoo	42817b98f9	Hide max participants box	2018-12-06 18:16:17 +09:00
Dan Balasescu	6ffd2190bc	Merge pull request #3824 from peppy/fix-no-internet-crashes ... Fix update code crashing when no internet connection is available	2018-12-06 15:28:13 +09:00
Dean Herbert	67a759122a	Fix update code crashing when no internet connection is available	2018-12-06 14:59:17 +09:00
Dan Balasescu	bebbbaa73c	Merge pull request #3822 from peppy/strongly-typed-statistics ... Change statistics to be int for now	2018-12-06 12:38:00 +09:00
smoogipoo	eadbe4c470	Make beatmap selection work	2018-12-06 12:21:30 +09:00
smoogipoo	5f0bde581c	Fix OsuBindableBeatmap not being able to be auto-constructed	2018-12-05 20:42:16 +09:00
smoogipoo	1a3c06f2d9	Fix OsuTestCase beatmap not having a correct default beatmap	2018-12-05 20:33:27 +09:00
Dean Herbert	94045413ce	Change statistics to be int for now	2018-12-05 19:44:01 +09:00
smoogipoo	e7d7e00516	Better disabling of various controls	2018-12-05 17:01:14 +09:00
Dan Balasescu	466505322e	Merge pull request #3819 from peppy/fix-double-working-beatmap-load ... Fix GetWorkingBeatmap potentially loading same beatmap twice	2018-12-05 16:05:46 +09:00
Dean Herbert	b5ba74a628	Add more specific checks	2018-12-05 02:12:15 +09:00