11668 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	5104ba8118	Merge branch 'master' into beatmap-as-a-skin	2018-03-22 13:45:30 +09:00
Dean Herbert	917334a39a	Move cancel code to exit paths for screen	2018-03-22 13:01:40 +09:00
Dean Herbert	e39b7b8d35	Don't hard-crash when an unknown section is encountered in a legacy file	2018-03-22 12:58:02 +09:00
Dean Herbert	504c3ff0ba	BeatmapSkin -> LegacyBeatmapSkin	2018-03-22 12:50:48 +09:00
Dan Balasescu	976702aef9	Merge branch 'master' into fix-osu-logo-sounds	2018-03-22 12:50:45 +09:00
Dean Herbert	c5eecae32f	Improve shared code paths in legacy skins	2018-03-22 12:50:23 +09:00
Dean Herbert	78a8f60b39	IHasComboIndex -> IHasComboInformation	2018-03-22 12:35:17 +09:00
Dean Herbert	1a782a840c	Fix xmldoc	2018-03-22 12:34:29 +09:00
Dan Balasescu	2d2b56bb75	Merge pull request #2246 from peppy/bail-on-invalid-archive ... Hard bail on attempting to import an invalid archive format	2018-03-22 11:59:52 +09:00
Dan Balasescu	77ebd94804	Merge branch 'master' into beatmap-as-a-skin	2018-03-22 11:33:27 +09:00
Dan Balasescu	552e7e314d	Merge branch 'master' into bail-on-invalid-archive	2018-03-22 11:32:38 +09:00
Dan Balasescu	606ad4b93b	Merge pull request #2244 from peppy/skin-ini-parsing ... Add skin.ini parsing	2018-03-22 11:32:24 +09:00
Dean Herbert	101caf3064	Apply same logic fixes to delete/restore all notifications	2018-03-22 11:28:40 +09:00
Dan Balasescu	53e79ca0d6	Merge branch 'master' into skin-ini-parsing	2018-03-22 11:17:14 +09:00
Dean Herbert	e0b74a357a	Fix osu! logo making hover beat sounds when not visible	2018-03-22 03:31:14 +09:00
Dean Herbert	8f71d53c17	Fix retry not allowing continuing beyond PlayerLoader ... Resolves #2265.	2018-03-22 02:10:31 +09:00
TocoToucan	4991f2ad2e	Change filename format	2018-03-21 18:27:08 +03:00
Dean Herbert	62229300c4	Fix DummyRuleset getting selected ... Resolves #2261.	2018-03-22 00:26:48 +09:00
Dean Herbert	e67d8e1354	Update nuspec to include humanizer localisations	2018-03-21 22:32:10 +09:00
Dean Herbert	4a93abcc36	Add scale adjusts to bring legacy skins in-line with lazer sizing	2018-03-21 20:07:58 +09:00
Dean Herbert	d909cce8d6	Add the ability to skin the gameplay cursor	2018-03-21 20:06:10 +09:00
Dean Herbert	65b6a2faad	Fix mod button sounds playing when mod overlay is not visible ... Resolves #2240.	2018-03-21 18:41:21 +09:00
Dean Herbert	271c082606	Adjust colour assignment	2018-03-21 16:25:32 +09:00
Dean Herbert	48142602ea	Adjust text size to match design	2018-03-21 16:04:43 +09:00
Dean Herbert	63f0419d6a	Apply minor fixes	2018-03-21 15:40:43 +09:00
Dean Herbert	f944c29505	Merge remote-tracking branch 'upstream/master' into take_screenshot	2018-03-21 12:32:27 +09:00
Dean Herbert	357a3c535e	Update framework	2018-03-21 12:29:49 +09:00
Dean Herbert	ccdd11d7b2	Add missing licence header	2018-03-21 12:29:44 +09:00
Dean Herbert	9a5e464c99	Merge branch 'master' into beat-snap-divisor	2018-03-20 22:26:02 +09:00
Dean Herbert	8ac660b0c6	Fixes for keyboard handling and general code quality	2018-03-20 22:25:15 +09:00
Dean Herbert	aa8b0d017c	Adjust colours and spacing	2018-03-20 21:59:56 +09:00
Dean Herbert	dac1ba21db	Make keyboard control work	2018-03-20 21:38:22 +09:00
Dean Herbert	045610dbfe	Adjust styling and colours	2018-03-20 21:31:17 +09:00
Dean Herbert	5a10270a2a	return -> break ... no real reason but whatever works	2018-03-20 20:32:32 +09:00
Dean Herbert	c2eb32c0e9	DrawableBeatDivisor -> BeatDivisorControl	2018-03-20 20:10:27 +09:00
Dean Herbert	6fd650777c	Move value change logic to bindable ... Also add drag support	2018-03-20 20:09:55 +09:00
Dan Balasescu	3151940435	Merge pull request #2231 from peppy/fix-catch-droplets ... Fix juice stream droplets spawning in incorrect locations	2018-03-20 20:06:22 +09:00
Dean Herbert	625e561fc8	Fix whitespace	2018-03-20 18:01:09 +09:00
Dean Herbert	fb3d319d0e	Make fallback bool into a function ... Allows correct handling now that beatmap skins are also a thing.	2018-03-20 16:40:11 +09:00
Dean Herbert	f03abb3145	Add GetTexture method to ISkinSource ... Used to shortcut lookup checks without potentially expensive drawable creation overhead.	2018-03-20 16:40:11 +09:00
Dean Herbert	9ad4e9284a	Add skin source fallback chain	2018-03-20 16:40:11 +09:00
Dean Herbert	fd0391daf7	Merge branch 'accent-colour-properties'	2018-03-20 16:25:22 +09:00
Dean Herbert	52472e005e	Merge branch 'beatmap-as-a-skin'	2018-03-20 16:24:41 +09:00
Dean Herbert	4aa9c26259	Merge branch 'skin-ini-parsing'	2018-03-20 16:24:35 +09:00
Dean Herbert	d1c2aa71d0	Add beatmap sample override support	2018-03-20 16:24:06 +09:00
Dean Herbert	9a0fc9e29a	Move combo colours completely out of beatmap	2018-03-20 16:24:06 +09:00
Dean Herbert	dbcf755618	Make Beatmaps parsable as skins	2018-03-20 16:05:29 +09:00
Dean Herbert	c38c26eacb	Move combo index processing to BeatmapProcessor	2018-03-20 15:57:43 +09:00
Dean Herbert	cb3d0db555	Move combo colours completely out of HitObjects	2018-03-20 15:50:12 +09:00
smoogipoo	786e6242e1	Make bdl beat divisor nullable	2018-03-20 14:01:06 +09:00