4528 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	1f3039926f	Reword settings text slightly	2017-05-15 12:57:55 +09:00
Dean Herbert	f730769186	Rewrite to make better	2017-05-15 12:54:56 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00
Dean Herbert	eb55d9a1ae	Merge pull request #744 from EVAST9919/mod_fix ... Fixed IncompatibleMods for OsuModAutoplay	2017-05-15 12:06:43 +09:00
Dean Herbert	240d73bbf1	Merge branch 'master' into mod_fix	2017-05-15 11:59:19 +09:00
Dan Balasescu	1632380002	Merge pull request #754 from peppy/settings-not-options ... Change all instances of options to settings where applicable	2017-05-15 11:20:45 +09:00
Dean Herbert	d969507f65	Update framework	2017-05-15 11:14:19 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
EVAST9919	b6460d89c9	Cleanup	2017-05-14 10:26:52 +03:00
EVAST9919	2b95b92429	Merge remote-tracking branch 'refs/remotes/ppy/master' into cursor_size	2017-05-14 09:48:18 +03:00
Dan Balasescu	ca2bf29194	Merge pull request #748 from EVAST9919/spinner_speed ... Spinner's difficulty depends on beatmap's OD	2017-05-14 15:41:16 +09:00
EVAST9919	7055c99df0	Added default value	2017-05-14 09:36:09 +03:00
EVAST9919	a4d5660e41	Cast SpinsRequired value to int	2017-05-14 09:22:49 +03:00
EVAST9919	49f5364e9e	CI fixes	2017-05-14 07:35:23 +03:00
EVAST9919	12dab6f75c	iplemented stable-like algorithm	2017-05-14 07:28:12 +03:00
EVAST9919	ef23405733	Applied suggested changes	2017-05-14 06:45:35 +03:00
EVAST9919	ca6df533bd	Automatic gameplay cursor size	2017-05-13 03:46:37 +03:00
EVAST9919	6d9e11a74f	CI fixes	2017-05-13 03:10:13 +03:00
EVAST9919	5532d3ec49	storing OD value only	2017-05-13 03:04:40 +03:00
EVAST9919	86ebd9d663	spinner's progress depends on current map OD now	2017-05-13 02:51:58 +03:00
smoogipooo	a25f11e809	Initial removal of TimingSection.	2017-05-12 22:23:32 +09:00
EVAST9919	19728b3d98	Fixed IncompatibleMods for OsuModAutoplay	2017-05-12 15:13:02 +03:00
Dean Herbert	08f980ccae	Merge pull request #722 from DrabWeb/playlist-commit ... Play first visible set in playlist on commit	2017-05-12 20:53:13 +09:00
Dean Herbert	fd9218b6d5	Use FirstOrDefault	2017-05-12 20:48:25 +09:00
Dean Herbert	24db423c4f	Merge remote-tracking branch 'upstream/master' into playlist-commit	2017-05-12 20:39:50 +09:00
Dean Herbert	cf9b121634	Merge pull request #743 from peppy/fix-beatmap-population ... Fix ruleset not always getting populated in a WorkingBeatmap	2017-05-12 20:38:45 +09:00
Dean Herbert	e096dd8126	Merge branch 'master' into fix-beatmap-population	2017-05-12 20:30:06 +09:00
Dean Herbert	a9b8e57be8	Merge pull request #728 from Jorolf/new-option-search ... add search box and the ability to search	2017-05-12 20:29:53 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dan Balasescu	d60da82c4c	Merge branch 'master' into fix-beatmap-population	2017-05-12 20:15:10 +09:00
Dan Balasescu	4c2ec046f0	Merge pull request #741 from peppy/chat-design-update ... Update chat design	2017-05-12 20:10:52 +09:00
Dean Herbert	6c117f15af	Remove unnecessary usings	2017-05-12 20:06:38 +09:00
Dean Herbert	a9b3f74218	Fix ruleset not always getting populated in a WorkingBeatmap	2017-05-12 20:05:44 +09:00
Dean Herbert	fec91d4de1	Update framework	2017-05-12 19:58:31 +09:00
Dean Herbert	d3770d8395	Merge branch 'master' into chat-design-update	2017-05-12 19:57:57 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace ... Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dan Balasescu	a27f92a4fb	Merge pull request #740 from peppy/resizable-chat ... Resizable chat	2017-05-12 19:52:41 +09:00
Dan Balasescu	a5ff3f4d32	Merge branch 'master' into resizable-chat	2017-05-12 19:46:11 +09:00
Dan Balasescu	65504e7cd4	Merge pull request #739 from peppy/multiple-chat-channels ... Multiple chat channels	2017-05-12 19:41:28 +09:00
Dan Balasescu	8ec79f788a	Merge branch 'master' into multiple-chat-channels	2017-05-12 19:35:12 +09:00
Dean Herbert	bc5bcfa66a	Make tab background opaque when chat is fullscreen	2017-05-12 19:15:04 +09:00
Dean Herbert	cf239f4d9c	Move chat into main content ... Also changes the way parallax is applied to OsuScreens game-wide.	2017-05-12 19:03:21 +09:00
Dean Herbert	181a5a8a61	Merge pull request #682 from EVAST9919/percentage ... Song Progress Info	2017-05-12 16:28:20 +09:00
EVAST9919	9a04069123	removed useless booleans, using nullables instead	2017-05-12 10:16:31 +03:00
Dean Herbert	dbf60d24bf	Second design update pass.	2017-05-12 15:39:00 +09:00
Dean Herbert	6ea65009c4	Initial design update pass	2017-05-12 15:38:55 +09:00
Dean Herbert	c4a93cbc85	Move drawable chat related classes to better namespace	2017-05-12 15:38:51 +09:00
Dean Herbert	9cf4998701	Make chat resizable via drag, save user set size	2017-05-12 15:36:37 +09:00
Dean Herbert	1420aa406c	Add framework fix.	2017-05-12 14:24:32 +09:00